diff options
| author | Hans Verkuil | 2015-03-04 10:47:57 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-03-23 19:46:38 +0100 |
| commit | 3f1ccf16f3ea015e57c326c2b14010bf119b6184 (patch) | |
| tree | b5f46a2102c5e37f23ff78175fae393105e1eef3 /drivers/media/platform/omap3isp | |
| parent | [media] v4l2-subdev.c: add 'which' checks for enum ops (diff) | |
| download | kernel-qcow2-linux-3f1ccf16f3ea015e57c326c2b14010bf119b6184.tar.gz kernel-qcow2-linux-3f1ccf16f3ea015e57c326c2b14010bf119b6184.tar.xz kernel-qcow2-linux-3f1ccf16f3ea015e57c326c2b14010bf119b6184.zip | |
[media] v4l2-subdev: support new 'which' field in enum_mbus_code
Support the new 'which' field in the enum_mbus_code ops. Most drivers do not
need to be changed since they always return the same enumeration regardless
of the 'which' field.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp')
| -rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispccp2.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispcsi2.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispresizer.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index b0431a988d47..818aa524edbc 100644 --- a/drivers/media/platform/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c @@ -2133,7 +2133,7 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd, case CCDC_PAD_SOURCE_OF: format = __ccdc_get_format(ccdc, cfg, code->pad, - V4L2_SUBDEV_FORMAT_TRY); + code->which); if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 || format->code == MEDIA_BUS_FMT_UYVY8_2X8) { @@ -2164,7 +2164,7 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd, return -EINVAL; format = __ccdc_get_format(ccdc, cfg, code->pad, - V4L2_SUBDEV_FORMAT_TRY); + code->which); /* A pixel code equal to 0 means that the video port doesn't * support the input format. Don't enumerate any pixel code. diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c index 3f10c3af3a0a..1d79368c1ba6 100644 --- a/drivers/media/platform/omap3isp/ispccp2.c +++ b/drivers/media/platform/omap3isp/ispccp2.c @@ -703,7 +703,7 @@ static int ccp2_enum_mbus_code(struct v4l2_subdev *sd, return -EINVAL; format = __ccp2_get_format(ccp2, cfg, CCP2_PAD_SINK, - V4L2_SUBDEV_FORMAT_TRY); + code->which); code->code = format->code; } diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c index 12ca63f2bf53..bde734cba86e 100644 --- a/drivers/media/platform/omap3isp/ispcsi2.c +++ b/drivers/media/platform/omap3isp/ispcsi2.c @@ -909,7 +909,7 @@ static int csi2_enum_mbus_code(struct v4l2_subdev *sd, code->code = csi2_input_fmts[code->index]; } else { format = __csi2_get_format(csi2, cfg, CSI2_PAD_SINK, - V4L2_SUBDEV_FORMAT_TRY); + code->which); switch (code->index) { case 0: /* Passthrough sink pad code */ diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c index 3ede27bc0a45..02549fa8a94d 100644 --- a/drivers/media/platform/omap3isp/ispresizer.c +++ b/drivers/media/platform/omap3isp/ispresizer.c @@ -1431,7 +1431,7 @@ static int resizer_enum_mbus_code(struct v4l2_subdev *sd, return -EINVAL; format = __resizer_get_format(res, cfg, RESZ_PAD_SINK, - V4L2_SUBDEV_FORMAT_TRY); + code->which); code->code = format->code; } |