From 9586f80fd6a58ac54cfd9f80d70721326f9d77fe Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 5 Aug 2008 13:05:17 -0400
Subject: [PATCH] --- yaml --- r: 107641 b: refs/heads/master c:
 580da34847488b404218d1d7f53b156f245f5555 h: refs/heads/master i:   107639:
 9a13dce21e66c222bde986cf1a915fbd19e55d95 v: v3

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

diff --git a/[refs] b/[refs]
index 71eb0468f755..f8086445ce15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca5de404ff036a29b25e9a83f6919c9f606c5841
+refs/heads/master: 580da34847488b404218d1d7f53b156f245f5555
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index 2fcc06eb5e60..586d6f1376cf 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -389,7 +389,6 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
 	if (io->entries <= 0)
 		return io->entries;
 
-	io->count = io->entries;
 	io->urbs = kmalloc(io->entries * sizeof *io->urbs, mem_flags);
 	if (!io->urbs)
 		goto nomem;
@@ -458,6 +457,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
 	io->urbs[--i]->transfer_flags &= ~URB_NO_INTERRUPT;
 
 	/* transaction state */
+	io->count = io->entries;
 	io->status = 0;
 	io->bytes = 0;
 	init_completion(&io->complete);