diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-14 15:35:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-14 15:35:55 +0200 |
| commit | 180370774f1a812f0f0ec33e10b3bd89770cdb57 (patch) | |
| tree | 46b2561ab6620dda8ab9880fa31f9ac85f9f3502 /drivers/usb | |
| parent | e1d67aa40ff1d2d75d526da6b5bbc77559b4690c (diff) | |
| download | barebox-180370774f1a812f0f0ec33e10b3bd89770cdb57.tar.gz barebox-180370774f1a812f0f0ec33e10b3bd89770cdb57.tar.xz | |
Revert "usb: ehci-hcd: use mdelay_non_interruptible()"
Now that the USB core makes sure that we do not re-enter USB
drivers we no longer need mdelay_non_interruptible() but can use
regular mdelay() again.
This reverts commit 4cfd909412e6ecfcef21c1ffabc8d515b39a0f85.
Diffstat (limited to 'drivers/usb')
| -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 b43b6c7f51..975a49c2e9 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_non_interruptible(50); + mdelay(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_non_interruptible(1); + mdelay(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_non_interruptible(5); + mdelay(5); ehci->rootdev = 0; |