From b4a3451ddcf791edaea7b2362f1b2466cc0b5f4c Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 11 Jan 2013 09:42:00 -0300
Subject: [PATCH] --- yaml --- r: 349039 b: refs/heads/master c:
 68d6f84ba0c47e658beff3a4bf0c43acee4b4690 h: refs/heads/master i:   349037:
 03433e5c7777b29d44cff3cc04ca16289745ef08   349035:
 a901cd38bab0f6deef31419032b5be40f5673de4   349031:
 00dcf483631e637bfdadb8c96a64441f82921670   349023:
 c9057abccc84ebdebbe22c641cbd907403fed513 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/usb/uvc/uvc_v4l2.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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;
 			}
 		}