---

yaml
---
r: 250271
b: refs/heads/master
c: f411f10
h: refs/heads/master
i:
  250269: 17d1b94
  250267: d827236
  250263: 8f2efea
  250255: b685c43
  250239: 745c185
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc2d573fb4e65393688d32bc128c70ddd8ecccc6
+refs/heads/master: f411f103822379bab356345430f097bdae3440e5

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: