UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: v4l2-ioctl: don't use CROP/COMPOSE_ACTIVE 

Drop the deprecated _ACTIVE part.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2018-10-05 03:10:20 -04:00 committed by Mauro Carvalho Chehab
parent fbe57dde71
commit 5b79da06f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/v4l2-core/v4l2-ioctl.c
View File

@ -2214,9 +2214,9 @@ static int v4l_g_crop(const struct v4l2_ioctl_ops *ops,
/* crop means compose for output devices */
if (V4L2_TYPE_IS_OUTPUT(p->type))
s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;
s.target = V4L2_SEL_TGT_COMPOSE;
else
s.target = V4L2_SEL_TGT_CROP_ACTIVE;
s.target = V4L2_SEL_TGT_CROP;
ret = v4l_g_selection(ops, file, fh, &s);
@ -2241,9 +2241,9 @@ static int v4l_s_crop(const struct v4l2_ioctl_ops *ops,
/* crop means compose for output devices */
if (V4L2_TYPE_IS_OUTPUT(p->type))
s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;
s.target = V4L2_SEL_TGT_COMPOSE;
else
s.target = V4L2_SEL_TGT_CROP_ACTIVE;
s.target = V4L2_SEL_TGT_CROP;
return v4l_s_selection(ops, file, fh, &s);
}