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; }