2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 26b278264796..39789232646d 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -84,7 +84,7 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
         init_completion(&vb->acked);
 
         /* We should always be able to add one buffer to an empty queue. */
-        if (vq->vq_ops->add_buf(vq, &sg, 1, 0, vb) != 0)
+        if (vq->vq_ops->add_buf(vq, &sg, 1, 0, vb) < 0)
                 BUG();
         vq->vq_ops->kick(vq);
 
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index a882f2606515..f53600580726 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -208,7 +208,11 @@ add_head:
 
         pr_debug("Added buffer head %i to %p\n", head, vq);
         END_USE(vq);
-        return 0;
+
+        /* If we're indirect, we can fit many (assuming not OOM). */
+        if (vq->indirect)
+                return vq->num_free ? vq->vring.num : 0;
+        return vq->num_free;
 }
 
 static void vring_kick(struct virtqueue *_vq)