]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
[media] v4l2-controls.h: update private control ranges to prevent overlap
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 29 Mar 2013 13:14:32 +0000 (10:14 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 29 Mar 2013 14:48:02 +0000 (11:48 -0300)
These ranges shouldn't overlap.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
include/uapi/linux/v4l2-controls.h

index 910d7cd3d9f4e93eae0f50bf8677ab55fc7a0735..7da22cec30cd50e8c19fc273ec64389de6549998 100644 (file)
@@ -153,12 +153,12 @@ enum v4l2_colorfx {
 
 
 /* The base for the s2255 driver controls.
- * We reserve 8 controls for this driver. */
-#define V4L2_CID_USER_S2255_BASE               (V4L2_CID_USER_BASE + 0x1010)
+ * We reserve 16 controls for this driver. */
+#define V4L2_CID_USER_S2255_BASE               (V4L2_CID_USER_BASE + 0x1030)
 
 /* The base for the si476x driver controls. See include/media/si476x.h for the list
- * of controls. Total of 16 controls is reserved for that driver */
-#define V4L2_CID_USER_SI476X_BASE              (V4L2_CID_USER_BASE + 0x1010)
+ * of controls. Total of 16 controls is reserved for this driver */
+#define V4L2_CID_USER_SI476X_BASE              (V4L2_CID_USER_BASE + 0x1040)
 
 /* MPEG-class control IDs */