diff options
| author | Steve Longerbeam <[email protected]> | 2018-06-27 14:39:43 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <[email protected]> | 2018-07-04 08:04:31 -0400 |
| commit | 421860b9d47053badce4b247576fa48df9ab4c48 (patch) | |
| tree | 4c7380a017f9b66c720301fb090796fae3a2a12e /tools/perf/scripts/python | |
| parent | de3e581f31626a9e5697ea1581967729fcffdd1d (diff) | |
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 <[email protected]>
Acked-by: Sakari Ailus <[email protected]>
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions