Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs

[sfrench/cifs-2.6.git] / drivers / char / virtio_console.c

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index b585b4789822f976dc794bbfc1923a4215c82d11..bfa640023e64893251d2cb2cf54af5a853d89568 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1449,6 +1449,8 @@ static int add_port(struct ports_device *portdev, u32 id)
        spin_lock_init(&port->outvq_lock);
        init_waitqueue_head(&port->waitqueue);
 
+       virtio_device_ready(portdev->vdev);
+
        /* Fill the in_vq with buffers so the host can send us data. */
        nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock);
        if (!nr_added_bufs) {
@@ -2182,6 +2184,8 @@ static int virtcons_restore(struct virtio_device *vdev)
        if (ret)
                return ret;
 
+       virtio_device_ready(portdev->vdev);
+
        if (use_multiport(portdev))
                fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);