From a877b8b6dfc56b0944fc6bb6bbb1b47210bcb8e7 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 17 Jun 2010 11:11:51 -0300
Subject: [PATCH] --- yaml --- r: 202080 b: refs/heads/master c:
 1b4e21c4f62eae6bdcb3e7bfdfc52171a24f3689 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/uvc/uvc_ctrl.c | 12 ++++++------
 trunk/include/linux/usb/video.h          |  7 +++++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e00843384045..71a007a1c48b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561474c2d2a1e212ea186e0b65cc69fb330e7bd5
+refs/heads/master: 1b4e21c4f62eae6bdcb3e7bfdfc52171a24f3689
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index bd72100a21dd..fa06cf512ecf 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -1324,9 +1324,8 @@ static void uvc_ctrl_add_ctrl(struct uvc_device *dev,
 		/* Check if the device control information and length match
 		 * the user supplied information.
 		 */
-		__u32 flags;
 		__le16 size;
-		__u8 inf;
+		__u8 _info;
 
 		ret = uvc_query_ctrl(dev, UVC_GET_LEN, ctrl->entity->id,
 			dev->intfnum, info->selector, (__u8 *)&size, 2);
@@ -1345,7 +1344,7 @@ static void uvc_ctrl_add_ctrl(struct uvc_device *dev,
 		}
 
 		ret = uvc_query_ctrl(dev, UVC_GET_INFO, ctrl->entity->id,
-			dev->intfnum, info->selector, &inf, 1);
+				     dev->intfnum, info->selector, &_info, 1);
 		if (ret < 0) {
 			uvc_trace(UVC_TRACE_CONTROL,
 				"GET_INFO failed on control %pUl/%u (%d).\n",
@@ -1353,9 +1352,10 @@ static void uvc_ctrl_add_ctrl(struct uvc_device *dev,
 			return;
 		}
 
-		flags = info->flags;
-		if (((flags & UVC_CONTROL_GET_CUR) && !(inf & (1 << 0))) ||
-		    ((flags & UVC_CONTROL_SET_CUR) && !(inf & (1 << 1)))) {
+		if (((info->flags & UVC_CONTROL_GET_CUR) &&
+		    !(_info & UVC_CONTROL_CAP_GET)) ||
+		    ((info->flags & UVC_CONTROL_SET_CUR) &&
+		    !(_info & UVC_CONTROL_CAP_SET))) {
 			uvc_trace(UVC_TRACE_CONTROL, "Control %pUl/%u flags "
 				"don't match supported operations.\n",
 				info->entity, info->selector);
diff --git a/trunk/include/linux/usb/video.h b/trunk/include/linux/usb/video.h
index be436d9ee479..2d5b7fc6a265 100644
--- a/trunk/include/linux/usb/video.h
+++ b/trunk/include/linux/usb/video.h
@@ -160,5 +160,12 @@
 #define UVC_STATUS_TYPE_CONTROL				1
 #define UVC_STATUS_TYPE_STREAMING			2
 
+/* 4.1.2. Control Capabilities */
+#define UVC_CONTROL_CAP_GET				(1 << 0)
+#define UVC_CONTROL_CAP_SET				(1 << 1)
+#define UVC_CONTROL_CAP_DISABLED			(1 << 2)
+#define UVC_CONTROL_CAP_AUTOUPDATE			(1 << 3)
+#define UVC_CONTROL_CAP_ASYNCHRONOUS			(1 << 4)
+
 #endif /* __LINUX_USB_VIDEO_H */