From eb634be4efed58fb805cd7eb32cc2b5d83bc308e Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 18 Jun 2010 10:16:33 -0400
Subject: [PATCH] --- yaml --- r: 200677 b: refs/heads/master c:
 64d65872f96e2a754caa12ef48949c314384bd9f h: refs/heads/master i:   200675:
 d2ecddf9b818d33d418a4edc22e5fc97f1d32c86 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/message.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 706c1e1cd185..079d96efbdb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b49d2315c119b9ae8a9a33b07d4eb7d194c01a7
+refs/heads/master: 64d65872f96e2a754caa12ef48949c314384bd9f
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index a73e08fdab36..fd4c36ea5e46 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -416,8 +416,11 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
 			/* A length of zero means transfer the whole sg list */
 			len = length;
 			if (len == 0) {
-				for_each_sg(sg, sg, nents, i)
-					len += sg->length;
+				struct scatterlist	*sg2;
+				int			j;
+
+				for_each_sg(sg, sg2, nents, j)
+					len += sg2->length;
 			}
 		} else {
 			/*