summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/coda
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-09-29 09:53:42 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-28 14:14:12 -0200
commitf157cf49186e87b6e8cda5a97e1f0f2ff39f57df (patch)
treeac1d0ab8f5f570f80f346d938791ce792636cb00 /drivers/media/platform/coda
parent1f923a42033ad05baf755775e3339b5c319b5898 (diff)
downloadop-kernel-dev-f157cf49186e87b6e8cda5a97e1f0f2ff39f57df.zip
op-kernel-dev-f157cf49186e87b6e8cda5a97e1f0f2ff39f57df.tar.gz
[media] coda: clear aborting flag in stop_streaming
Clearing the aborting flag in stop_streaming is necessary if we want to start streaming again without having to closing and reopening the device. Also, do not explicitly set it in default_params; the context is zeroed by kzalloc anyway. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/coda')
-rw-r--r--drivers/media/platform/coda/coda-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index ced4760..3f8a04f 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -880,7 +880,6 @@ static void set_default_params(struct coda_ctx *ctx)
ctx->params.codec_mode = ctx->codec->mode;
ctx->colorspace = V4L2_COLORSPACE_REC709;
ctx->params.framerate = 30;
- ctx->aborting = 0;
/* Default formats for output and input queues */
ctx->q_data[V4L2_M2M_SRC].fourcc = ctx->codec->src_fourcc;
@@ -1144,6 +1143,7 @@ static void coda_stop_streaming(struct vb2_queue *q)
kfifo_init(&ctx->bitstream_fifo,
ctx->bitstream.vaddr, ctx->bitstream.size);
ctx->runcounter = 0;
+ ctx->aborting = 0;
}
}
OpenPOWER on IntegriCloud