---

yaml --- r: 273215 b: refs/heads/master c: 005b20a h: refs/heads/master i: 273213: a2a36c6 273211: 1147be4 273207: f2fed80 273199: 62f1ff1 273183: c86ba5b 273151: 0c2669f v: v3
git-mirror · Nov 2, 2011 · 208ef3b · 208ef3b
1 parent 707224f
commit 208ef3b
Show file tree

Hide file tree

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