Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab
5b79da06 fbe57dde

+4 -4
+4 -4
drivers/media/v4l2-core/v4l2-ioctl.c
··· 2214 2214 2215 2215 /* crop means compose for output devices */ 2216 2216 if (V4L2_TYPE_IS_OUTPUT(p->type)) 2217 - s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE; 2217 + s.target = V4L2_SEL_TGT_COMPOSE; 2218 2218 else 2219 - s.target = V4L2_SEL_TGT_CROP_ACTIVE; 2219 + s.target = V4L2_SEL_TGT_CROP; 2220 2220 2221 2221 ret = v4l_g_selection(ops, file, fh, &s); 2222 2222 ··· 2241 2241 2242 2242 /* crop means compose for output devices */ 2243 2243 if (V4L2_TYPE_IS_OUTPUT(p->type)) 2244 - s.target = V4L2_SEL_TGT_COMPOSE_ACTIVE; 2244 + s.target = V4L2_SEL_TGT_COMPOSE; 2245 2245 else 2246 - s.target = V4L2_SEL_TGT_CROP_ACTIVE; 2246 + s.target = V4L2_SEL_TGT_CROP; 2247 2247 2248 2248 return v4l_s_selection(ops, file, fh, &s); 2249 2249 }