diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-13 14:42:25 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-04-07 12:58:35 -0500 |
| commit | ea16328f80ca8d74434352157f37ef60e2f55ce2 (patch) | |
| tree | 0d80a9aa4dc5b3d32baa0ff90cc999cb51d1f2d5 /drivers/usb/host/ehci-hub.c | |
| parent | b9e451885deb6262dbaf5cd14aa77d192d9ac759 (diff) | |
| download | lwn-ea16328f80ca8d74434352157f37ef60e2f55ce2.tar.gz lwn-ea16328f80ca8d74434352157f37ef60e2f55ce2.zip | |
usb: host: ehci: use new USB_RESUME_TIMEOUT
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 87cf86f38b36..7354d0129a72 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -471,10 +471,13 @@ static int ehci_bus_resume (struct usb_hcd *hcd) ehci_writel(ehci, temp, &ehci->regs->port_status [i]); } - /* msleep for 20ms only if code is trying to resume port */ + /* + * msleep for USB_RESUME_TIMEOUT ms only if code is trying to resume + * port + */ if (resume_needed) { spin_unlock_irq(&ehci->lock); - msleep(20); + msleep(USB_RESUME_TIMEOUT); spin_lock_irq(&ehci->lock); if (ehci->shutdown) goto shutdown; @@ -942,7 +945,7 @@ int ehci_hub_control( temp &= ~PORT_WAKE_BITS; ehci_writel(ehci, temp | PORT_RESUME, status_reg); ehci->reset_done[wIndex] = jiffies - + msecs_to_jiffies(20); + + msecs_to_jiffies(USB_RESUME_TIMEOUT); set_bit(wIndex, &ehci->resuming_ports); usb_hcd_start_port_resume(&hcd->self, wIndex); break; |