From 8160920dbf32801cf712ba7a37764e8af52c20e6 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 31 Jul 2006 10:16:24 -0400
Subject: [PATCH] --- yaml --- r: 33068 b: refs/heads/master c:
 f443ddf1057776ed99d5006bbbefb018fcf7ce3a h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/host/uhci-q.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc644fa73353..edb32e7a9c95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de1caa475120c716ff33d344b5ffefc288ed77c7
+refs/heads/master: f443ddf1057776ed99d5006bbbefb018fcf7ce3a
diff --git a/trunk/drivers/usb/host/uhci-q.c b/trunk/drivers/usb/host/uhci-q.c
index c9d72ac0a1d7..66c3f61bc9d1 100644
--- a/trunk/drivers/usb/host/uhci-q.c
+++ b/trunk/drivers/usb/host/uhci-q.c
@@ -943,7 +943,9 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb)
 			/* We received a short packet */
 			if (urb->transfer_flags & URB_SHORT_NOT_OK)
 				ret = -EREMOTEIO;
-			else if (ctrlstat & TD_CTRL_SPD)
+
+			/* Fixup needed only if this isn't the URB's last TD */
+			else if (&td->list != urbp->td_list.prev)
 				ret = 1;
 		}