From: Hans Verkuil Date: Thu, 5 Mar 2015 08:19:23 +0000 (-0300) Subject: [media] marvell-ccic: fill in colorspace X-Git-Tag: v4.2-rc1~107^2~434 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e6e609530a1f4306b8fb3e2c4d6abff9d9be30e;p=karo-tx-linux.git [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 Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab --- 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; }