From: Amit Shah <amit.shah@redhat.com>
Date: Sun, 9 Dec 2012 23:15:12 +0000 (+1030)
Subject: virtio: console: don't rely on virtqueue_add_buf() returning capacity.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=49e86f16866fbf8e3c9a6b0770eb6f3c167f4b72;p=linux-beck.git

virtio: console: don't rely on virtqueue_add_buf() returning capacity.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 8ab9c3d4bf13..89bdc31a3dc6 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -396,6 +396,8 @@ static int add_inbuf(struct virtqueue *vq, struct port_buffer *buf)
 
 	ret = virtqueue_add_buf(vq, sg, 0, 1, buf, GFP_ATOMIC);
 	virtqueue_kick(vq);
+	if (!ret)
+		ret = vq->num_free;
 	return ret;
 }