diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-03-04 01:47:57 -0800 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-23 11:46:38 -0700 |
| commit | 3f1ccf16f3ea015e57c326c2b14010bf119b6184 (patch) | |
| tree | b5f46a2102c5e37f23ff78175fae393105e1eef3 /drivers/staging/media | |
| parent | 20058f90916b7ed5e986c399240f58d9af8892e0 (diff) | |
[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/staging/media')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_csi2.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_ipipeif.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_resizer.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c index e404ad4fd987..2d5079deb631 100644 --- a/drivers/staging/media/omap4iss/iss_csi2.c +++ b/drivers/staging/media/omap4iss/iss_csi2.c @@ -908,7 +908,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/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c index 948edcca8704..b8e7277499d2 100644 --- a/drivers/staging/media/omap4iss/iss_ipipeif.c +++ b/drivers/staging/media/omap4iss/iss_ipipeif.c @@ -467,7 +467,7 @@ static int ipipeif_enum_mbus_code(struct v4l2_subdev *sd, return -EINVAL; format = __ipipeif_get_format(ipipeif, cfg, IPIPEIF_PAD_SINK, - V4L2_SUBDEV_FORMAT_TRY); + code->which); code->code = format->code; break; diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index f9b0aac91e9d..075b876e8e68 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -513,7 +513,7 @@ static int resizer_enum_mbus_code(struct v4l2_subdev *sd, case RESIZER_PAD_SOURCE_MEM: format = __resizer_get_format(resizer, cfg, RESIZER_PAD_SINK, - V4L2_SUBDEV_FORMAT_TRY); + code->which); if (code->index == 0) { code->code = format->code; |