diff options
author | Sylwester Nawrocki <sylvester.nawrocki@gmail.com> | 2012-08-22 17:03:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-06 08:11:18 -0400 |
commit | eb3c311cde590cf28362019caafeb00a6d3e44db (patch) | |
tree | 714b383ad00471e71144a983aa6626f0ff6014fa /drivers/media | |
parent | cb9e40fc98847375a8cddf3449985d0784aba868 (diff) |
[media] soc-camera: Use new selection target definitions
Replace the deprecated V4L2_SEL_TGT_*_ACTIVE selection target
names with their new unified counterparts.
Compatibility definitions are already in linux/v4l2-common.h.
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/soc_camera/soc_camera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 3be92944f8e7..d9b53569459c 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c | |||
@@ -950,11 +950,11 @@ static int soc_camera_s_selection(struct file *file, void *fh, | |||
950 | 950 | ||
951 | /* In all these cases cropping emulation will not help */ | 951 | /* In all these cases cropping emulation will not help */ |
952 | if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || | 952 | if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || |
953 | (s->target != V4L2_SEL_TGT_COMPOSE_ACTIVE && | 953 | (s->target != V4L2_SEL_TGT_COMPOSE && |
954 | s->target != V4L2_SEL_TGT_CROP_ACTIVE)) | 954 | s->target != V4L2_SEL_TGT_CROP)) |
955 | return -EINVAL; | 955 | return -EINVAL; |
956 | 956 | ||
957 | if (s->target == V4L2_SEL_TGT_COMPOSE_ACTIVE) { | 957 | if (s->target == V4L2_SEL_TGT_COMPOSE) { |
958 | /* No output size change during a running capture! */ | 958 | /* No output size change during a running capture! */ |
959 | if (is_streaming(ici, icd) && | 959 | if (is_streaming(ici, icd) && |
960 | (icd->user_width != s->r.width || | 960 | (icd->user_width != s->r.width || |
@@ -974,7 +974,7 @@ static int soc_camera_s_selection(struct file *file, void *fh, | |||
974 | 974 | ||
975 | ret = ici->ops->set_selection(icd, s); | 975 | ret = ici->ops->set_selection(icd, s); |
976 | if (!ret && | 976 | if (!ret && |
977 | s->target == V4L2_SEL_TGT_COMPOSE_ACTIVE) { | 977 | s->target == V4L2_SEL_TGT_COMPOSE) { |
978 | icd->user_width = s->r.width; | 978 | icd->user_width = s->r.width; |
979 | icd->user_height = s->r.height; | 979 | icd->user_height = s->r.height; |
980 | if (!icd->streamer) | 980 | if (!icd->streamer) |