media: v4l2-ctrls: Fix CID base conflict between MAX217X and IMX
authorSteve Longerbeam <slongerbeam@gmail.com>
Wed, 27 Jun 2018 18:39:43 +0000 (14:39 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 4 Jul 2018 12:04:31 +0000 (08:04 -0400)
commit421860b9d47053badce4b247576fa48df9ab4c48
tree4c7380a017f9b66c720301fb090796fae3a2a12e
parentde3e581f31626a9e5697ea1581967729fcffdd1d
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>
include/uapi/linux/v4l2-controls.h