From: Anatolij Gustschin <agust@denx.de>
Date: Tue, 2 Nov 2010 10:47:29 +0000 (+0100)
Subject: usb: fix for USB_ST_STALLED status reporting in ehci_submit_async()
X-Git-Tag: v2010.12-rc2~41^2^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=222d6dff27b81dd9cfd57b984538f3d481aae0f5;p=oweals%2Fu-boot.git

usb: fix for USB_ST_STALLED status reporting in ehci_submit_async()

Checking the status field of the qTD token in the current code
do not take into acount cases where endpoint stall (halted) bit
is set together with XactErr status bit. As a result clearing
stall on an endpoint won't be done if this status bit was also
set. Check for halted bit and report USB_ST_STALLED status
if the host controller also indicates endpoit stall condition.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 982f96e8b8..c7fba10489 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -491,6 +491,8 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
 			break;
 		default:
 			dev->status = USB_ST_CRC_ERR;
+			if ((token & 0x40) == 0x40)
+				dev->status |= USB_ST_STALLED;
 			break;
 		}
 		dev->act_len = length - ((token >> 16) & 0x7fff);