usb: musb: Stop bulk endpoint while queue is rotated

[pandora-kernel.git] / drivers / usb / musb / musb_host.c

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index c655c71..f2b7268 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1384,9 +1384,15 @@ static void musb_bulk_rx_nak_timeout(struct musb *musb, struct musb_hw_ep *ep)
        musb_ep_select(mbase, ep->epnum);
        dma = is_dma_capable() ? ep->rx_channel : NULL;
 
-       /* clear nak timeout bit */
+       /*
+        * Need to stop the transaction by clearing REQPKT first
+        * then the NAK Timeout bit ref MUSBMHDRC USB 2.0 HIGH-SPEED
+        * DUAL-ROLE CONTROLLER Programmer's Guide, section 9.2.2
+        */
        rx_csr = musb_readw(epio, MUSB_RXCSR);
        rx_csr |= MUSB_RXCSR_H_WZC_BITS;
+       rx_csr &= ~MUSB_RXCSR_H_REQPKT;
+       musb_writew(epio, MUSB_RXCSR, rx_csr);
        rx_csr &= ~MUSB_RXCSR_DATAERROR;
        musb_writew(epio, MUSB_RXCSR, rx_csr);