diff options
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-lite.c')
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-lite.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-lite.c b/drivers/media/video/s5p-fimc/fimc-lite.c index 52ede56e0758..8785089c4460 100644 --- a/drivers/media/video/s5p-fimc/fimc-lite.c +++ b/drivers/media/video/s5p-fimc/fimc-lite.c | |||
@@ -1086,9 +1086,9 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd, | |||
1086 | struct fimc_lite *fimc = v4l2_get_subdevdata(sd); | 1086 | struct fimc_lite *fimc = v4l2_get_subdevdata(sd); |
1087 | struct flite_frame *f = &fimc->inp_frame; | 1087 | struct flite_frame *f = &fimc->inp_frame; |
1088 | 1088 | ||
1089 | if ((sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL && | 1089 | if ((sel->target != V4L2_SEL_TGT_CROP && |
1090 | sel->target != V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS) || | 1090 | sel->target != V4L2_SEL_TGT_CROP_BOUNDS) || |
1091 | sel->pad != FLITE_SD_PAD_SINK) | 1091 | sel->pad != FLITE_SD_PAD_SINK) |
1092 | return -EINVAL; | 1092 | return -EINVAL; |
1093 | 1093 | ||
1094 | if (sel->which == V4L2_SUBDEV_FORMAT_TRY) { | 1094 | if (sel->which == V4L2_SUBDEV_FORMAT_TRY) { |
@@ -1097,7 +1097,7 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd, | |||
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | mutex_lock(&fimc->lock); | 1099 | mutex_lock(&fimc->lock); |
1100 | if (sel->target == V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL) { | 1100 | if (sel->target == V4L2_SEL_TGT_CROP) { |
1101 | sel->r = f->rect; | 1101 | sel->r = f->rect; |
1102 | } else { | 1102 | } else { |
1103 | sel->r.left = 0; | 1103 | sel->r.left = 0; |
@@ -1122,8 +1122,7 @@ static int fimc_lite_subdev_set_selection(struct v4l2_subdev *sd, | |||
1122 | struct flite_frame *f = &fimc->inp_frame; | 1122 | struct flite_frame *f = &fimc->inp_frame; |
1123 | int ret = 0; | 1123 | int ret = 0; |
1124 | 1124 | ||
1125 | if (sel->target != V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL || | 1125 | if (sel->target != V4L2_SEL_TGT_CROP || sel->pad != FLITE_SD_PAD_SINK) |
1126 | sel->pad != FLITE_SD_PAD_SINK) | ||
1127 | return -EINVAL; | 1126 | return -EINVAL; |
1128 | 1127 | ||
1129 | mutex_lock(&fimc->lock); | 1128 | mutex_lock(&fimc->lock); |