diff options
| author | Peter Mamonov <pmamonov@gmail.com> | 2015-09-24 19:20:27 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-02 07:50:51 +0200 |
| commit | 4cfd909412e6ecfcef21c1ffabc8d515b39a0f85 (patch) | |
| tree | 0931e1add3f702a1dfb09d4da2f4a39c3d657c78 /drivers/usb/host | |
| parent | 8426cc641dbd9c4e948ae4b5f3f89463e969eb1e (diff) | |
| download | barebox-4cfd909412e6ecfcef21c1ffabc8d515b39a0f85.tar.gz barebox-4cfd909412e6ecfcef21c1ffabc8d515b39a0f85.tar.xz | |
usb: ehci-hcd: use mdelay_non_interruptible()
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 975a49c2e9..b43b6c7f51 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -688,7 +688,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, * root */ ehci_powerup_fixup(ehci); - mdelay(50); + mdelay_non_interruptible(50); ehci->portreset |= 1 << port; /* terminate the reset */ ehci_writel(status_reg, reg & ~EHCI_PS_PR); @@ -751,7 +751,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, goto unknown; } - mdelay(1); + mdelay_non_interruptible(1); len = min3(srclen, (int)le16_to_cpu(req->length), length); if (srcptr != NULL && len > 0) memcpy(buffer, srcptr, len); @@ -888,7 +888,7 @@ static int ehci_init(struct usb_host *host) ehci_writel(&ehci->hcor->or_configflag, cmd); /* unblock posted write */ cmd = ehci_readl(&ehci->hcor->or_usbcmd); - mdelay(5); + mdelay_non_interruptible(5); ehci->rootdev = 0; |