[RESEND,v3,18/20] media: ti-vpe: cal: Fix a WARN issued when start streaming fails
diff mbox series

Message ID 20191112145347.23519-19-bparrot@ti.com
State New
Headers show
  • media: ti-vpe: cal: maintenance
Related show

Commit Message

Benoit Parrot Nov. 12, 2019, 2:53 p.m. UTC
When start_streaming fails after the buffers have been queued we have to
make sure all buffers are returned to user-space properly otherwise a
v4l2 level WARN is generated.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
 drivers/media/platform/ti-vpe/cal.c | 5 +++++
 1 file changed, 5 insertions(+)

diff mbox series

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 091119bee8fc..92a54d59d433 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1695,10 +1695,15 @@  static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
 	return 0;
+	spin_lock_irqsave(&ctx->slock, flags);
+	vb2_buffer_done(&ctx->cur_frm->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
+	ctx->cur_frm = NULL;
+	ctx->next_frm = NULL;
 	list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
 		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
+	spin_unlock_irqrestore(&ctx->slock, flags);
 	return ret;