summaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorSouptick Joarder2019-02-04 16:01:43 +0100
committerMauro Carvalho Chehab2019-03-19 19:03:55 +0100
commitf14f6aa0b4423632ab76f3eed3a28159049451ef (patch)
tree8a525fce169c513bc2374bb5fffd87fd6e2c3f04 /drivers/media/common
parentmedia: gspca: do not resubmit URBs when streaming has stopped (diff)
downloadkernel-qcow2-linux-f14f6aa0b4423632ab76f3eed3a28159049451ef.tar.gz
kernel-qcow2-linux-f14f6aa0b4423632ab76f3eed3a28159049451ef.tar.xz
kernel-qcow2-linux-f14f6aa0b4423632ab76f3eed3a28159049451ef.zip
media: videobuf2: Return error after allocation failure
There is no point to continuing assignment after memory allocation failed, rather throw error immediately. Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> [hverkuil-cisco@xs4all.nl: rebase and remove empty line before the if] Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/videobuf2/videobuf2-vmalloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
index 6dfbd5b05907..1c6659f7c394 100644
--- a/drivers/media/common/videobuf2/videobuf2-vmalloc.c
+++ b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
@@ -46,17 +46,17 @@ static void *vb2_vmalloc_alloc(struct device *dev, unsigned long attrs,
buf->size = size;
buf->vaddr = vmalloc_user(buf->size);
- buf->dma_dir = dma_dir;
- buf->handler.refcount = &buf->refcount;
- buf->handler.put = vb2_vmalloc_put;
- buf->handler.arg = buf;
-
if (!buf->vaddr) {
pr_debug("vmalloc of size %ld failed\n", buf->size);
kfree(buf);
return ERR_PTR(-ENOMEM);
}
+ buf->dma_dir = dma_dir;
+ buf->handler.refcount = &buf->refcount;
+ buf->handler.put = vb2_vmalloc_put;
+ buf->handler.arg = buf;
+
refcount_set(&buf->refcount, 1);
return buf;
}