aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-subdev.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2012-05-18 08:31:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 19:15:48 -0400
commit5689b28890f4a7c4e12290dbf2c29a9d23047335 (patch)
treea7df462fdb85c8d59dd1713a184a9d3f39e53e7e /drivers/media/video/v4l2-subdev.c
parent1ec0ed083988ae433305d7f4158fda8c3a1a23b9 (diff)
[media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
Change the users of V4L2_SUBDEV_SEL_TGT_* targets to use V4L2_SEL_TGT_* instead. The common definitions are moved to a new header file, include/linux/v4l2-common.h. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-subdev.c')
-rw-r--r--drivers/media/video/v4l2-subdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index cd86f0c3ec74..9182f81deb5b 100644
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -245,7 +245,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
245 memset(&sel, 0, sizeof(sel)); 245 memset(&sel, 0, sizeof(sel));
246 sel.which = crop->which; 246 sel.which = crop->which;
247 sel.pad = crop->pad; 247 sel.pad = crop->pad;
248 sel.target = V4L2_SUBDEV_SEL_TGT_CROP; 248 sel.target = V4L2_SEL_TGT_CROP;
249 249
250 rval = v4l2_subdev_call( 250 rval = v4l2_subdev_call(
251 sd, pad, get_selection, subdev_fh, &sel); 251 sd, pad, get_selection, subdev_fh, &sel);
@@ -274,7 +274,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
274 memset(&sel, 0, sizeof(sel)); 274 memset(&sel, 0, sizeof(sel));
275 sel.which = crop->which; 275 sel.which = crop->which;
276 sel.pad = crop->pad; 276 sel.pad = crop->pad;
277 sel.target = V4L2_SUBDEV_SEL_TGT_CROP; 277 sel.target = V4L2_SEL_TGT_CROP;
278 sel.r = crop->rect; 278 sel.r = crop->rect;
279 279
280 rval = v4l2_subdev_call( 280 rval = v4l2_subdev_call(