From c5e29c4a3052930b7900deb55bb9d21e5a0d3f64 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 12 Jun 2009 22:16:35 -0600
Subject: [PATCH] --- yaml --- r: 147961 b: refs/heads/master c:
 ef688e151c00e5d529703be9a04fd506df8bc54e h: refs/heads/master i:   147959:
 1c95ab73c0dc2b630bfaaf6fd3830fabdf04a17b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/virtio/virtio.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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