summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/xhci-ring.c3
-rw-r--r--include/usb/xhci.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 68cf08e0b6b..34eb4536f0e 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -17,6 +17,7 @@
#include <log.h>
#include <asm/byteorder.h>
#include <usb.h>
+#include <watchdog.h>
#include <asm/unaligned.h>
#include <linux/bug.h>
#include <linux/errno.h>
@@ -796,6 +797,8 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
/* Calculate length for next transfer */
addr += trb_buff_len;
trb_buff_len = min((length - running_total), TRB_MAX_BUFF_SIZE);
+
+ schedule();
} while (running_total < length);
giveback_first_trb(udev, ep_index, start_cycle, start_trb);
diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 5fcdae1421f..ba065311df5 100644
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -1134,8 +1134,6 @@ void xhci_hcd_stop(int index);
/*************************************************************
EXTENDED CAPABILITY DEFINITIONS
*************************************************************/
-/* Up to 16 ms to halt an HC */
-#define XHCI_MAX_HALT_USEC (16*1000)
/* HC not running - set to 1 when run/stop bit is cleared. */
#define XHCI_STS_HALT (1 << 0)