---

yaml --- r: 200677 b: refs/heads/master c: 64d6587 h: refs/heads/master i: 200675: d2ecddf v: v3
git-mirror · Jun 30, 2010 · eb634be · eb634be
1 parent 0c87028
commit eb634be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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 {
 			/*