summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/marvell-ccic
diff options
context:
space:
mode:
authorHans Verkuil2015-03-05 09:19:23 +0100
committerMauro Carvalho Chehab2015-05-01 12:41:00 +0200
commit2e6e609530a1f4306b8fb3e2c4d6abff9d9be30e (patch)
treeceaf0bddc0e3acb431e07ec5cfa22e08c34a24af /drivers/media/platform/marvell-ccic
parent[media] ov7670: check for valid width/height in ov7670_enum_frame_interval (diff)
downloadkernel-qcow2-linux-2e6e609530a1f4306b8fb3e2c4d6abff9d9be30e.tar.gz
kernel-qcow2-linux-2e6e609530a1f4306b8fb3e2c4d6abff9d9be30e.tar.xz
kernel-qcow2-linux-2e6e609530a1f4306b8fb3e2c4d6abff9d9be30e.zip
[media] marvell-ccic: fill in colorspace
The colorspace field wasn't filled in properly. This fixes a v4l2-compliance failure. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
-rw-r--r--drivers/media/platform/marvell-ccic/mcam-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 76357cf1234a..7e54cef09d54 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -188,6 +188,7 @@ static const struct v4l2_pix_format mcam_def_pix_format = {
.field = V4L2_FIELD_NONE,
.bytesperline = VGA_WIDTH*2,
.sizeimage = VGA_WIDTH*VGA_HEIGHT*2,
+ .colorspace = V4L2_COLORSPACE_SRGB,
};
static const u32 mcam_def_mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
@@ -1437,6 +1438,7 @@ static int mcam_vidioc_try_fmt_vid_cap(struct file *filp, void *priv,
break;
}
pix->sizeimage = pix->height * pix->bytesperline;
+ pix->colorspace = V4L2_COLORSPACE_SRGB;
return ret;
}