From b5df8ab25da5aa6db7c6506df51af044791f45db Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sat, 30 Apr 2011 09:46:11 -0300
Subject: [PATCH] --- yaml --- r: 250271 b: refs/heads/master c:
 f411f103822379bab356345430f097bdae3440e5 h: refs/heads/master i:   250269:
 17d1b94287635da7ecdef89cea2cd4ec59d99376   250267:
 d82723672bd2d84b38b75724da4dda82aa0dd032   250263:
 8f2efea183dfffd1e92e6e07d02fe2873895766f   250255:
 b685c43ce92951774dbd3485c148d6abecb1f2ac   250239:
 745c18556ab9475a9043226358cbc2bd9abe5286 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/uvc/uvc_ctrl.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 551ea7fad6ad..98a7965158d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc2d573fb4e65393688d32bc128c70ddd8ecccc6
+refs/heads/master: f411f103822379bab356345430f097bdae3440e5
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index 0dc2a9f7ca51..a4db26fa2f53 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -1221,6 +1221,23 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,
 		if (xctrl->value < 0 || xctrl->value >= mapping->menu_count)
 			return -ERANGE;
 		value = mapping->menu_info[xctrl->value].value;
+
+		/* Valid menu indices are reported by the GET_RES request for
+		 * UVC controls that support it.
+		 */
+		if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) {
+			if (!ctrl->cached) {
+				ret = uvc_ctrl_populate_cache(chain, ctrl);
+				if (ret < 0)
+					return ret;
+			}
+
+			step = mapping->get(mapping, UVC_GET_RES,
+					uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES));
+			if (!(step & value))
+				return -ERANGE;
+		}
+
 		break;
 
 	default: