---

yaml --- r: 349037 b: refs/heads/master c: 9bf4230 h: refs/heads/master i: 349035: a901cd3 v: v3
git-mirror · Jan 11, 2013 · 03433e5 · 03433e5
1 parent a2223e3
commit 03433e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 734d1ece37fbf3d2ddfc71bc6c69e0fe35f02542
+refs/heads/master: 9bf42300e672fb1b5587d1da5486f8b144e74598
diff --git a/trunk/drivers/media/usb/uvc/uvc_ctrl.c b/trunk/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1431,8 +1431,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain,
 	int ret;
 
 	ctrl = uvc_find_control(chain, xctrl->id, &mapping);
-	if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0)
+	if (ctrl == NULL)
 		return -EINVAL;
+	if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR))
+		return -EACCES;
 
 	/* Clamp out of range values. */
 	switch (mapping->v4l2_type) {