Commit dde6bdcc authored Nov 28, 2018 by Hans Verkuil Committed by Mauro Carvalho Chehab Dec 03, 2018

media: vb2: don't unbind/put the object when going to state QUEUED



When a buffer is returned to state QUEUED (that happens when
start_streaming fails), then do not unbind and put the object
from the request. Nothing has changed yet, so just keep it as
is.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 6093d300

drivers/media/common/videobuf2/videobuf2-core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -947,7 +947,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
		}
		atomic_dec(&q->owned_by_drv_count);

		if (vb->req_obj.req) {
		if (state != VB2_BUF_STATE_QUEUED && vb->req_obj.req) {
		/* This is not supported at the moment */
		WARN_ON(state == VB2_BUF_STATE_REQUEUEING);
		media_request_object_unbind(&vb->req_obj);

Admin message