OSDN Git Service

media: vb2: don't call __vb2_queue_cancel if vb2_start_streaming failed
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 28 Nov 2018 08:37:43 +0000 (03:37 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 3 Dec 2018 20:00:50 +0000 (15:00 -0500)
commit04990215dec43c424daff00d1f622167b8aafd1f
tree18baf2493a0233ed910fc48ce55f191e4a5c983b
parent53e9d838275d9a2a5736d788f84814c64cbf94b0
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 b3379c6201bb3.

Fixes: b3379c6201bb3 ('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>
drivers/media/common/videobuf2/videobuf2-core.c