From 208ef3be26f9eb5c91eb1266733a5c2cb7f729b7 Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krkumar2@in.ibm.com>
Date: Wed, 5 Oct 2011 11:08:59 +0530
Subject: [PATCH] --- yaml --- r: 273215 b: refs/heads/master c:
 005b20a8e0f587a46a00910ba4507bb9f6da70ea h: refs/heads/master i:   273213:
 a2a36c68d6145d10451a7ca372eccac4dfa0bb3d   273211:
 1147be450980ac6951d12c17aab7a63636e49566   273207:
 f2fed80353107c6ad27f103ce91b767af7eb99e1   273199:
 62f1ff1e18b911651502364dda66f8ca8497b71b   273183:
 c86ba5b9ced959ae0e9aba278d9e6ac73ed85ff0   273151:
 0c2669f67742e981f13947241fe644836c0d4f74 v: v3

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

diff --git a/[refs] b/[refs]
index 23388786aae1..ed0630f6bbab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e38483b350405542c8080134408fd8897394ba2
+refs/heads/master: 005b20a8e0f587a46a00910ba4507bb9f6da70ea
diff --git a/trunk/drivers/virtio/virtio_pci.c b/trunk/drivers/virtio/virtio_pci.c
index 4bcc8b82640b..79a31e5b4b68 100644
--- a/trunk/drivers/virtio/virtio_pci.c
+++ b/trunk/drivers/virtio/virtio_pci.c
@@ -415,9 +415,13 @@ static struct virtqueue *setup_vq(struct virtio_device *vdev, unsigned index,
 		}
 	}
 
-	spin_lock_irqsave(&vp_dev->lock, flags);
-	list_add(&info->node, &vp_dev->virtqueues);
-	spin_unlock_irqrestore(&vp_dev->lock, flags);
+	if (callback) {
+		spin_lock_irqsave(&vp_dev->lock, flags);
+		list_add(&info->node, &vp_dev->virtqueues);
+		spin_unlock_irqrestore(&vp_dev->lock, flags);
+	} else {
+		INIT_LIST_HEAD(&info->node);
+	}
 
 	return vq;