From 17d5c1394e3fe27d12c58b54aa1f72f07c563dbb Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Mon, 18 Jan 2010 19:14:59 +0530 Subject: [PATCH] --- yaml --- r: 180791 b: refs/heads/master c: f550804ab92e37a08d2622522a0f11252a2158ea h: refs/heads/master i: 180789: 2bc9cf1d67fcec860bae01e666047a295314ac05 180787: 5aafe94f6292aa047417b1010142da701b599432 180783: 7cee357d52ad63c7af2c278748caaf0d550db70b v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9f5c647c2207..93bc471773cb 100644 --- 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 index 791be4e91d15..bfc0abf825ed 100644 --- 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 */