diff --git a/[refs] b/[refs]
index 5fde3779142d..770a0c8faeef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29005c09f41d459c458eb8761a54703b56afb16a
+refs/heads/master: 68d6f84ba0c47e658beff3a4bf0c43acee4b4690
diff --git a/trunk/drivers/media/usb/uvc/uvc_v4l2.c b/trunk/drivers/media/usb/uvc/uvc_v4l2.c
index 5eb89894f90b..68d59b527492 100644
--- a/trunk/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/trunk/drivers/media/usb/uvc/uvc_v4l2.c
@@ -685,7 +685,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 			ret = uvc_ctrl_set(chain, ctrl);
 			if (ret < 0) {
 				uvc_ctrl_rollback(handle);
-				ctrls->error_idx = i;
+				ctrls->error_idx = cmd == VIDIOC_S_EXT_CTRLS
+						 ? ctrls->count : i;
 				return ret;
 			}
 		}