Use is_timeout_non_interruptible() intead of is_timeout()
to avoid re-entering ehci-hcd functions from pollers,
registered by usb drivers.
Signed-off-by: Peter Mamonov <pmamonov@xxxxxxxxx>
---
drivers/usb/host/ehci-hcd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 1077ac4..7ca77bf 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -137,7 +137,7 @@ static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
result &= mask;
if (result == done)
return 0;
- if (is_timeout(start, usec * USECOND))
+ if (is_timeout_non_interruptible(start, usec * USECOND))
return -ETIMEDOUT;
}
}
@@ -357,7 +357,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer,
do {
token = hc32_to_cpu(vtd->qt_token);
token = hc32_to_cpu(__raw_readl((void *)&vtd->qt_token));
- if (is_timeout(start, timeout_val)) {
+ if (is_timeout_non_interruptible(start, timeout_val)) {
/* Disable async schedule. */
cmd = ehci_readl(&ehci->hcor->or_usbcmd);
cmd &= ~CMD_ASE;
--
2.1.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
