projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[cascardo/linux.git]
/
drivers
/
virtio
/
virtio_ring.c
diff --git
a/drivers/virtio/virtio_ring.c
b/drivers/virtio/virtio_ring.c
index
1ca8890
..
afe7e21
100644
(file)
--- a/
drivers/virtio/virtio_ring.c
+++ b/
drivers/virtio/virtio_ring.c
@@
-119,7
+119,7
@@
static int vring_add_indirect(struct vring_virtqueue *vq,
desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
if (!desc)
- return
vq->vring.num
;
+ return
-ENOMEM
;
/* Transfer entries from the sg list into the indirect page */
for (i = 0; i < out; i++) {