2 files changed, 13 insertions, 6 deletions

diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 132c9ccfdc62..72295ea2fd1c 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -109,8 +109,8 @@ static int probe_common(struct virtio_device *vdev)
 
         vi->index = index = ida_simple_get(&rng_index_ida, 0, 0, GFP_KERNEL);
         if (index < 0) {
-                kfree(vi);
-                return index;
+                err = index;
+                goto err_ida;
         }
         sprintf(vi->name, "virtio_rng.%d", index);
         init_completion(&vi->have_data);
@@ -128,13 +128,16 @@ static int probe_common(struct virtio_device *vdev)
         vi->vq = virtio_find_single_vq(vdev, random_recv_done, "input");
         if (IS_ERR(vi->vq)) {
                 err = PTR_ERR(vi->vq);
-                vi->vq = NULL;
-                kfree(vi);
-                ida_simple_remove(&rng_index_ida, index);
-                return err;
+                goto err_find;
         }
 
         return 0;
+
+err_find:
+        ida_simple_remove(&rng_index_ida, index);
+err_ida:
+        kfree(vi);
+        return err;
 }
 
 static void remove_common(struct virtio_device *vdev)
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index b585b4789822..bfa640023e64 100644
--- 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);