Skip to content

Commit

Permalink
[media] vb2-core: add support for count == 0 in create_bufs
Browse files Browse the repository at this point in the history
This also fixes incorrect error handling in create_bufs: the return code
of __vb2_queue_alloc is the number of allocated buffers, and not a
traditional error code.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jul 6, 2012
1 parent 37d9ed9 commit f05393d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/media/video/videobuf2-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,9 +669,9 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create
/* Finally, allocate buffers and video memory */
ret = __vb2_queue_alloc(q, create->memory, num_buffers,
num_planes);
if (ret < 0) {
dprintk(1, "Memory allocation failed with error: %d\n", ret);
return ret;
if (ret == 0) {
dprintk(1, "Memory allocation failed\n");
return -ENOMEM;
}

allocated_buffers = ret;
Expand Down Expand Up @@ -702,7 +702,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create

if (ret < 0) {
__vb2_queue_free(q, allocated_buffers);
return ret;
return -ENOMEM;
}

/*
Expand All @@ -726,6 +726,8 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
int ret = __verify_memory_type(q, create->memory, create->format.type);

create->index = q->num_buffers;
if (create->count == 0)
return ret != -EBUSY ? ret : 0;
return ret ? ret : __create_bufs(q, create);
}
EXPORT_SYMBOL_GPL(vb2_create_bufs);
Expand Down

0 comments on commit f05393d

Please sign in to comment.