History

[media] v4l2-controls.h: update private control ranges to prevent overlap

These ranges shouldn't overlap.

Hans Verkuil committed 13 years ago

Commit 2cb59721 parent 79a63c61 file · +4 −4Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/linux/v4l2-controls.h+4−4
@@ -153,12 +153,12 @@ enum v4l2_colorfx { · 152 unmodified lines
153153
154154
155155 /* The base for the s2255 driver controls.
156− * We reserve 8 controls for this driver. */
157−#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1010)
156+ * We reserve 16 controls for this driver. */
157+#define V4L2_CID_USER_S2255_BASE (V4L2_CID_USER_BASE + 0x1030)
158158
159159 /* The base for the si476x driver controls. See include/media/si476x.h for the list
160− * of controls. Total of 16 controls is reserved for that driver */
161−#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1010)
160+ * of controls. Total of 16 controls is reserved for this driver */
161+#define V4L2_CID_USER_SI476X_BASE (V4L2_CID_USER_BASE + 0x1040)
162162
163163 /* MPEG-class control IDs */
164164