1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 303cb6f90108..7dddb1860936 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -102,9 +102,13 @@ static int virtio_dev_remove(struct device *_d)
         struct virtio_driver *drv = container_of(dev->dev.driver,
                                                  struct virtio_driver, driver);
 
-        dev->config->set_status(dev, dev->config->get_status(dev)
-                                & ~VIRTIO_CONFIG_S_DRIVER);
         drv->remove(dev);
+
+        /* Driver should have reset device. */
+        BUG_ON(dev->config->get_status(dev));
+
+        /* Acknowledge the device's existence again. */
+        add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
         return 0;
 }
 
@@ -130,6 +134,10 @@ int register_virtio_device(struct virtio_device *dev)
         dev->dev.bus = &virtio_bus;
         sprintf(dev->dev.bus_id, "%u", dev->index);
 
+        /* We always start by resetting the device, in case a previous
+         * driver messed it up.  This also tests that code path a little. */
+        dev->config->reset(dev);
+
         /* Acknowledge that we've seen the device. */
         add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);