---

yaml --- r: 147961 b: refs/heads/master c: ef688e1 h: refs/heads/master i: 147959: 1c95ab7 v: v3
git-mirror · Jun 12, 2009 · c5e29c4 · c5e29c4
1 parent 6f3de9c
commit c5e29c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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;
 }