projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
video
/
omap3isp
/
ispresizer.c
diff --git
a/drivers/media/video/omap3isp/ispresizer.c
b/drivers/media/video/omap3isp/ispresizer.c
index 14041c9c8643fdd85d9c295facd2ff54983e53d6..ae17d917f77b3657ef4553e26ea039768b9bc3e3 100644
(file)
--- a/
drivers/media/video/omap3isp/ispresizer.c
+++ b/
drivers/media/video/omap3isp/ispresizer.c
@@
-1249,7
+1249,7
@@
static int resizer_get_selection(struct v4l2_subdev *sd,
sel->which);
switch (sel->target) {
sel->which);
switch (sel->target) {
- case V4L2_S
UBDEV_S
EL_TGT_CROP_BOUNDS:
+ case V4L2_SEL_TGT_CROP_BOUNDS:
sel->r.left = 0;
sel->r.top = 0;
sel->r.width = INT_MAX;
sel->r.left = 0;
sel->r.top = 0;
sel->r.width = INT_MAX;
@@
-1259,7
+1259,7
@@
static int resizer_get_selection(struct v4l2_subdev *sd,
resizer_calc_ratios(res, &sel->r, format_source, &ratio);
break;
resizer_calc_ratios(res, &sel->r, format_source, &ratio);
break;
- case V4L2_S
UBDEV_SEL_TGT_CROP_ACTUAL
:
+ case V4L2_S
EL_TGT_CROP
:
sel->r = *__resizer_get_crop(res, fh, sel->which);
resizer_calc_ratios(res, &sel->r, format_source, &ratio);
break;
sel->r = *__resizer_get_crop(res, fh, sel->which);
resizer_calc_ratios(res, &sel->r, format_source, &ratio);
break;
@@
-1293,7
+1293,7
@@
static int resizer_set_selection(struct v4l2_subdev *sd,
struct v4l2_mbus_framefmt *format_sink, *format_source;
struct resizer_ratio ratio;
struct v4l2_mbus_framefmt *format_sink, *format_source;
struct resizer_ratio ratio;
- if (sel->target != V4L2_S
UBDEV_SEL_TGT_CROP_ACTUAL
||
+ if (sel->target != V4L2_S
EL_TGT_CROP
||
sel->pad != RESZ_PAD_SINK)
return -EINVAL;
sel->pad != RESZ_PAD_SINK)
return -EINVAL;