summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-04-10 07:32:18 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:13 (GMT)
commit0ca5cf1562705634cf182dbb2b40a00093783518 (patch)
tree71b37283aaecdd1913af5c631c48b18a5e0a56f1
parent9e9ab7cdd5d3c2f7ae8905e0331e699a58ffaefe (diff)
downloadlinux-3.10-0ca5cf1562705634cf182dbb2b40a00093783518.zip
linux-3.10-0ca5cf1562705634cf182dbb2b40a00093783518.tar.gz
linux-3.10-0ca5cf1562705634cf182dbb2b40a00093783518.tar.bz2
[media] s5p-jpeg: Fix NV12 format entry related to S5C2120 SoC
S5PC210 SoC doesn't support encoding NV12 raw images. Remove relavant flag from the respective entry in the sjpeg_formats array. Change-Id: Ibe70ae070afab4dcf380c41dc36a2a276b8f78f3 Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index a4afa6a..0dcb796 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -192,8 +192,7 @@ static struct s5p_jpeg_fmt sjpeg_formats[] = {
.colplanes = 2,
.h_align = 4,
.v_align = 4,
- .flags = SJPEG_FMT_FLAG_ENC_OUTPUT |
- SJPEG_FMT_FLAG_DEC_CAPTURE |
+ .flags = SJPEG_FMT_FLAG_DEC_CAPTURE |
SJPEG_FMT_FLAG_S5P |
SJPEG_FMT_NON_RGB,
.subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_420,