diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /drivers/virtio/virtio_ring.c | |
parent | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (diff) | |
parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'drivers/virtio/virtio_ring.c')
-rw-r--r-- | drivers/virtio/virtio_ring.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 1475ed6b575f..cc2f73e03475 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c | |||
@@ -230,9 +230,6 @@ add_head: | |||
230 | pr_debug("Added buffer head %i to %p\n", head, vq); | 230 | pr_debug("Added buffer head %i to %p\n", head, vq); |
231 | END_USE(vq); | 231 | END_USE(vq); |
232 | 232 | ||
233 | /* If we're indirect, we can fit many (assuming not OOM). */ | ||
234 | if (vq->indirect) | ||
235 | return vq->num_free ? vq->vring.num : 0; | ||
236 | return vq->num_free; | 233 | return vq->num_free; |
237 | } | 234 | } |
238 | EXPORT_SYMBOL_GPL(virtqueue_add_buf_gfp); | 235 | EXPORT_SYMBOL_GPL(virtqueue_add_buf_gfp); |