diff --git a/[refs] b/[refs] index c2b1f52bdfe1..7a5e90308d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20f77f5654042cf484d8964b618faf9d620f639b +refs/heads/master: ef688e151c00e5d529703be9a04fd506df8bc54e diff --git a/trunk/drivers/virtio/virtio.c b/trunk/drivers/virtio/virtio.c index 018c070a357f..6b6810364860 100644 --- a/trunk/drivers/virtio/virtio.c +++ b/trunk/drivers/virtio/virtio.c @@ -118,13 +118,14 @@ static int virtio_dev_probe(struct device *_d) if (device_features & (1 << i)) set_bit(i, dev->features); + dev->config->finalize_features(dev); + err = drv->probe(dev); if (err) add_status(dev, VIRTIO_CONFIG_S_FAILED); - else { - dev->config->finalize_features(dev); + else add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK); - } + return err; }