2015-02-13 05:32:37

by Rusty Russell

[permalink] [raw]
Subject: [PATCH] virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.

I noticed this with the console device. It's not *wrong*, just a bit
weird.

Signed-off-by: Rusty Russell <[email protected]>

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);