diff options
| author | Steve Longerbeam | 2018-06-27 20:39:43 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-07-04 14:04:31 +0200 |
| commit | 421860b9d47053badce4b247576fa48df9ab4c48 (patch) | |
| tree | 4c7380a017f9b66c720301fb090796fae3a2a12e /include/uapi/linux/v4l2-controls.h | |
| parent | media: stk1160: Set the vb2_queue lock before calling vb2_queue_init (diff) | |
| download | kernel-qcow2-linux-421860b9d47053badce4b247576fa48df9ab4c48.tar.gz kernel-qcow2-linux-421860b9d47053badce4b247576fa48df9ab4c48.tar.xz kernel-qcow2-linux-421860b9d47053badce4b247576fa48df9ab4c48.zip | |
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: Steve Longerbeam <steve_longerbeam@mentor.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'include/uapi/linux/v4l2-controls.h')
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 8d473c979b61..8a75ad7899f3 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -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 |