Hi Ben,
On Thu, Dec 18, 2014 at 02:49:33PM +, Ben Hutchings wrote:
From: Ian Molton ian.mol...@codethink.co.uk
Videobuf2 complains about buffers that are still marked ACTIVE (in use by the
driver) following a call to stop_streaming().
This patch returns all active buffers to state ERROR prior to stopping.
Note: this introduces a (non fatal) race condition as the stream is not
guaranteed to be stopped at this point.
Signed-off-by: Ian Molton ian.mol...@codethink.co.uk
Signed-off-by: William Towle william.to...@codethink.co.uk
---
drivers/media/platform/soc_camera/rcar_vin.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c
b/drivers/media/platform/soc_camera/rcar_vin.c
index 773de53..7069176 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -516,8 +516,14 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
struct soc_camera_host *ici = to_soc_camera_host(icd-parent);
struct rcar_vin_priv *priv = ici-priv;
struct list_head *buf_head, *tmp;
+ int i;
spin_lock_irq(priv-lock);
+
+ for (i = 0; i vq-num_buffers; ++i)
+ if (vq-bufs[i]-state == VB2_BUF_STATE_ACTIVE)
+ vb2_buffer_done(vq-bufs[i], VB2_BUF_STATE_ERROR);
+
list_for_each_safe(buf_head, tmp, priv-capture)
list_del_init(buf_head);
spin_unlock_irq(priv-lock);
I'd use the driver's own queued buffer list to access the queued buffers,
you alread loop over that just below your own change.
--
Regards,
Sakari Ailus
e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
