From 40a0a01886f11ff66b2be7320d1b102bd33a92e9 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Mon, 10 Dec 2012 09:45:12 +1030 Subject: [PATCH] --- yaml --- r: 347463 b: refs/heads/master c: 49e86f16866fbf8e3c9a6b0770eb6f3c167f4b72 h: refs/heads/master i: 347461: e3a478c0b6cfbd783c863c128d11f30a28b29138 347459: 816479ab2e80a5e254539dccb85738a4c6e29281 347455: b5c74865914764f2cc56b06d60f5ff3a0966ad37 v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab35d3da7ee5..589105acc587 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ed4cb073438e2154778f0d693d966359afd6549 +refs/heads/master: 49e86f16866fbf8e3c9a6b0770eb6f3c167f4b72 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index 8ab9c3d4bf13..89bdc31a3dc6 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/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; }