---

yaml --- r: 180791 b: refs/heads/master c: f550804 h: refs/heads/master i: 180789: 2bc9cf1 180787: 5aafe94 180783: 7cee357 v: v3
git-mirror · Feb 24, 2010 · 17d5c13 · 17d5c13
1 parent 4127fef
commit 17d5c13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dff399616a79b8ef5d61ad68f2ef1e1f590b465
+refs/heads/master: f550804ab92e37a08d2622522a0f11252a2158ea
diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c
@@ -204,6 +204,11 @@ static int __devinit virtcons_probe(struct virtio_device *dev)
 	struct virtqueue *vqs[2];
 	int err;
 
+	if (vdev) {
+		dev_warn(&vdev->dev,
+			 "Multiple virtio-console devices not supported yet\n");
+		return -EEXIST;
+	}
 	vdev = dev;
 
 	/* This is the scratch page we use to receive console input */