upstream: [media] vb2: call buf_finish from __queue_cancel
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 4 Mar 2014 10:34:49 +0000 (07:34 -0300)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:54:53 +0000 (11:54 +0900)
commit114c68078b9dfc67b61718899260f4d1be39ae08
tree5452ceb7947c67172776b11e8390a8220f47347e
parent488e5ceeec7dc94a48112ac00badf892549cce20
upstream: [media] vb2: call buf_finish from __queue_cancel

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>
drivers/media/parport/bw-qcam.c
drivers/media/pci/sta2x11/sta2x11_vip.c
drivers/media/usb/uvc/uvc_queue.c
drivers/media/v4l2-core/videobuf2-core.c
include/media/videobuf2-core.h