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

media: vb2: don't call __vb2_queue_cancel if vb2_start_streaming failed



vb2_start_streaming() already rolls back the buffers, so there is no
need to call __vb2_queue_cancel(). Especially since __vb2_queue_cancel()
does too much, such as zeroing the q->queued_count value, causing vb2
to think that no buffers have been queued.

It appears that this call to __vb2_queue_cancel() is a left-over from
before commit b3379c62.

Fixes: b3379c62 ('vb2: only call start_streaming if sufficient buffers are queued')

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: <stable@vger.kernel.org>      # for v4.16 and up
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 53e9d838

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -1940,11 +1940,9 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type)
		if (ret)
		return ret;
		ret = vb2_start_streaming(q);
		if (ret) {
		__vb2_queue_cancel(q);
		if (ret)
		return ret;
		}
		}

		q->streaming = 1;

Admin message