From 67c0f5e41947c10b4c6823c1e39e1b2eae39ddaf Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 21 Jun 2012 06:35:04 -0300
Subject: [PATCH] --- yaml --- r: 320108 b: refs/heads/master c:
 4807063faa08f279b4ca9c2b1f0101a4670f7d43 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5f62c24ea9ad..c3e508cf3d54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c854a48a97feb94ccd4501593badd1b9907326c2
+refs/heads/master: 4807063faa08f279b4ca9c2b1f0101a4670f7d43
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
index 39f5c85dd4b4..7ac4347ca09e 100644
--- a/trunk/drivers/media/video/uvc/uvc_video.c
+++ b/trunk/drivers/media/video/uvc/uvc_video.c
@@ -1598,7 +1598,7 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
 			psize = le16_to_cpu(ep->desc.wMaxPacketSize);
 			psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3));
 			if (psize >= bandwidth && psize <= best_psize) {
-				altsetting = i;
+				altsetting = alts->desc.bAlternateSetting;
 				best_psize = psize;
 				best_ep = ep;
 			}