diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-03-04 14:34:49 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-11 13:56:39 +0400 |
| commit | 9c0863b1cc485f2bacac0675c68b73e5341cfd26 (patch) | |
| tree | add2ca56deca15ea064d34966edfa21dcef40fe3 /drivers/media/pci/sta2x11/sta2x11_vip.c | |
| parent | 1a17948184a3320e0bb0aab561112211d2e9b7a8 (diff) | |
| download | linux-9c0863b1cc485f2bacac0675c68b73e5341cfd26.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/pci/sta2x11/sta2x11_vip.c')
| -rw-r--r-- | drivers/media/pci/sta2x11/sta2x11_vip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c index e66556cae7ea..bb11443ed63e 100644 --- a/drivers/media/pci/sta2x11/sta2x11_vip.c +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c @@ -337,7 +337,8 @@ static void buffer_finish(struct vb2_buffer *vb) list_del_init(&vip_buf->list); spin_unlock(&vip->lock); - vip_active_buf_next(vip); + if (vb2_is_streaming(vb->vb2_queue)) + vip_active_buf_next(vip); } static int start_streaming(struct vb2_queue *vq, unsigned int count) |