AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] media: vb2: fix allocation failure check

Browse Source 
__vb2_queue_alloc function returns the number of successfully allocated
buffers. There is no point in checking if the returned value is negative.
If this function returns 0, videobuf2 should just return -ENOMEM to
userspace, because no driver can work without memory buffers.

Reported-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Marek Szyprowski 2011-06-28 08:29:02 -03:00 committed by Mauro Carvalho Chehab
parent afdea8bac5
commit 66072d4fa7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/videobuf2-core.c
View File

@ -532,9 +532,9 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
/* Finally, allocate buffers and video memory */ /* Finally, allocate buffers and video memory */
ret = __vb2_queue_alloc(q, req->memory, num_buffers, num_planes, ret = __vb2_queue_alloc(q, req->memory, num_buffers, num_planes,
plane_sizes); plane_sizes);
if (ret < 0) { if (ret == 0) {
dprintk(1, "Memory allocation failed with error: %d\n", ret); dprintk(1, "Memory allocation failed\n");
return ret; return -ENOMEM;
} }
/* /*