diff options
| author | Peter Mamonov <pmamonov@gmail.com> | 2015-09-09 15:56:39 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-09-10 09:16:42 +0200 |
| commit | fe02d7e6c8d9b9e5d4c6b1e3302cf59274380996 (patch) | |
| tree | 577e962f199be872752f9b2d2e3cd57982f63d7e /drivers/usb/host/ehci-hcd.c | |
| parent | d3b39aeffd806b18b782979648e0f6ed8f4994bc (diff) | |
| download | barebox-fe02d7e6c8d9b9e5d4c6b1e3302cf59274380996.tar.gz barebox-fe02d7e6c8d9b9e5d4c6b1e3302cf59274380996.tar.xz | |
usb: ehci-hcd: use is_timeout_non_interruptible()
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@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 8b4abeb6bf..9dc37d3bc0 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; } } @@ -356,7 +356,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, vtd = td; do { token = hc32_to_cpu(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; |