X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fvirtio%2Fvirtio.c;h=5ce2aa48fc6e0943031f28c2a51d639e71b52f36;hb=dc5f2c5f6aa159ebf4b29b169aa1f71cf98d3d6a;hp=b9f70dfc4751858da43f4f437ef10ac675d6340f;hpb=8328509c4bdf28b83fd7104ca9da01bf3b58c7b0;p=cascardo%2Flinux.git

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index b9f70dfc4751..5ce2aa48fc6e 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -236,7 +236,10 @@ static int virtio_dev_probe(struct device *_d)
 	if (err)
 		goto err;
 
-	add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
+	/* If probe didn't do it, mark device DRIVER_OK ourselves. */
+	if (!(dev->config->get_status(dev) & VIRTIO_CONFIG_S_DRIVER_OK))
+		virtio_device_ready(dev);
+
 	if (drv->scan)
 		drv->scan(dev);