summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/coda
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2014-08-05 14:00:18 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 15:25:26 -0500
commit2dc546d00c8deb22aac50c8cc0c6293aab975c6b (patch)
tree074cfbffe1cbba2703fc16daa94744a4a77d04ce /drivers/media/platform/coda
parent18fd0cceb99fdfd551bb6520703f8e1be4f3f364 (diff)
downloadop-kernel-dev-2dc546d00c8deb22aac50c8cc0c6293aab975c6b.zip
op-kernel-dev-2dc546d00c8deb22aac50c8cc0c6293aab975c6b.tar.gz
[media] coda: fix coda_s_fmt_vid_out
Set the context color space when s_fmt succeeded, not when it failed. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> 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/coda')
-rw-r--r--drivers/media/platform/coda/coda-common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index e84b320..dfecb86 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -504,7 +504,9 @@ static int coda_s_fmt_vid_out(struct file *file, void *priv,
ret = coda_s_fmt(ctx, f);
if (ret)
- ctx->colorspace = f->fmt.pix.colorspace;
+ return ret;
+
+ ctx->colorspace = f->fmt.pix.colorspace;
return ret;
}
OpenPOWER on IntegriCloud