[media] vb2: call buf_finish from __queue_cancel

Browse source

If a queue was canceled, then the buf_finish op was never called for the
pending buffers. So add this call to queue_cancel. Before calling buf_finish
set the buffer state to PREPARED, which is the correct state. That way the
states DONE and ERROR will only be seen in buf_finish if streaming is in
progress.

Since buf_finish can now be called from non-streaming state we need to
adapt the handful of drivers that actually need to know this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

...

This commit is contained in:

Hans Verkuil 2014-03-04 07:34:49 -03:00 • committed by Mauro Carvalho Chehab

parent 1a17948184

commit 9c0863b1cc

5 changed files with 31 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/media/parport/bw-qcam.c

View file

3

drivers/media/pci/sta2x11/sta2x11_vip.c

View file

3

drivers/media/usb/uvc/uvc_queue.c

View file

17

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

View file

10

include/media/videobuf2-core.h

View file