aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2013-09-30 10:34:45 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-28 15:23:41 -0200
commiteb107516ed60dfcec25218e1becf66bb91eafe87 (patch)
treea0d932b9ad2eae674b0ce56d396eba56e30c876a /drivers/media/platform
parent[media] coda: allow more than four instances on CODA7541 (diff)
downloadlinux-dev-eb107516ed60dfcec25218e1becf66bb91eafe87.tar.xz
linux-dev-eb107516ed60dfcec25218e1becf66bb91eafe87.zip
[media] coda: only set buffered input queue for decoder
Allow device_run with no buffers queued after streamoff only when the current instance is a decoder. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> [k.debski@samsung.com: Add commit description] Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/coda.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 28055388f2e8..945c53951791 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1928,8 +1928,9 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
if (!(ctx->streamon_out & ctx->streamon_cap))
return 0;
- /* Allow device_run with no buffers queued and after streamoff */
- v4l2_m2m_set_src_buffered(ctx->m2m_ctx, true);
+ /* Allow decoder device_run with no new buffers queued */
+ if (ctx->inst_type == CODA_INST_DECODER)
+ v4l2_m2m_set_src_buffered(ctx->m2m_ctx, true);
ctx->gopcounter = ctx->params.gop_size - 1;
buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);