Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b1b58c authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: re-queue buffers if start_streaming fails 



Patch b906352c ([media] coda: dequeue buffers if start_streaming fails)
incorrectly marked buffers as DEQUEUED in case of start_streaming failure, when
in fact they should be set to QUEUED. The videobuf2 core warns about this.

Reported-by: default avatarJean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f2035364

drivers/media/platform/coda/coda-common.c

+2 −2
Original line number Diff line number Diff line
@@ -1250,10 +1250,10 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
err:

	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {

		while ((buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx)))

			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);

			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);

	} else {

		while ((buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx)))

			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);

			v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);

	}

	return ret;

}