Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421860b9 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX 



When the imx-media driver was initially merged, there was a conflict
with 8d67ae25 ("media: v4l2-ctrls: Reserve controls for MAX217X") which
was not fixed up correctly, resulting in V4L2_CID_USER_MAX217X_BASE and
V4L2_CID_USER_IMX_BASE taking on the same value. Fix by assigning imx
CID base the next available range at 0x10b0.

Signed-off-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent de3e581f

include/uapi/linux/v4l2-controls.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ enum v4l2_colorfx { 


/* The base for the imx driver controls.

 * We reserve 16 controls for this driver. */

#define V4L2_CID_USER_IMX_BASE			(V4L2_CID_USER_BASE + 0x1090)

#define V4L2_CID_USER_IMX_BASE			(V4L2_CID_USER_BASE + 0x10b0)



/* MPEG-class control IDs */

/* The MPEG controls are applicable to all codec controls