aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp/ispccdc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
-rw-r--r--drivers/media/video/omap3isp/ispccdc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 7e32331b60fb..f1220d3d4970 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -2014,7 +2014,7 @@ static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
2014 return -EINVAL; 2014 return -EINVAL;
2015 2015
2016 switch (sel->target) { 2016 switch (sel->target) {
2017 case V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS: 2017 case V4L2_SEL_TGT_CROP_BOUNDS:
2018 sel->r.left = 0; 2018 sel->r.left = 0;
2019 sel->r.top = 0; 2019 sel->r.top = 0;
2020 sel->r.width = INT_MAX; 2020 sel->r.width = INT_MAX;
@@ -2024,7 +2024,7 @@ static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
2024 ccdc_try_crop(ccdc, format, &sel->r); 2024 ccdc_try_crop(ccdc, format, &sel->r);
2025 break; 2025 break;
2026 2026
2027 case V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL: 2027 case V4L2_SEL_TGT_CROP:
2028 sel->r = *__ccdc_get_crop(ccdc, fh, sel->which); 2028 sel->r = *__ccdc_get_crop(ccdc, fh, sel->which);
2029 break; 2029 break;
2030 2030
@@ -2052,7 +2052,7 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
2052 struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd); 2052 struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
2053 struct v4l2_mbus_framefmt *format; 2053 struct v4l2_mbus_framefmt *format;
2054 2054
2055 if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL || 2055 if (sel->target != V4L2_SEL_TGT_CROP ||
2056 sel->pad != CCDC_PAD_SOURCE_OF) 2056 sel->pad != CCDC_PAD_SOURCE_OF)
2057 return -EINVAL; 2057 return -EINVAL;
2058 2058
@@ -2064,7 +2064,7 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
2064 * pad. If the KEEP_CONFIG flag is set, just return the current crop 2064 * pad. If the KEEP_CONFIG flag is set, just return the current crop
2065 * rectangle. 2065 * rectangle.
2066 */ 2066 */
2067 if (sel->flags & V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG) { 2067 if (sel->flags & V4L2_SEL_FLAG_KEEP_CONFIG) {
2068 sel->r = *__ccdc_get_crop(ccdc, fh, sel->which); 2068 sel->r = *__ccdc_get_crop(ccdc, fh, sel->which);
2069 return 0; 2069 return 0;
2070 } 2070 }