[media] vb2: don't init the list if there are still buffers
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 24 Feb 2014 16:41:20 +0000 (13:41 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 11 Mar 2014 09:56:41 +0000 (06:56 -0300)
commita7afcaccfab2fb012841852eaead79861dc9cb5f
tree48608d82c9e908484477fd3220435c54545712bd
parent6ea3b980f058d9dbc79ba88c652d581fa2d00792
[media] vb2: don't init the list if there are still buffers

__vb2_queue_free() would init the queued_list at all times, even if
q->num_buffers > 0. This should only happen if num_buffers == 0.

This situation can happen if a CREATE_BUFFERS call couldn't allocate
enough buffers and had to free those it did manage to allocate before
returning an error.

While we're at it: __vb2_queue_alloc() returns the number of buffers
allocated, not an error code. So stick the result in allocated_buffers
instead of ret as that's very confusing.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/v4l2-core/videobuf2-core.c