diff options
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 d7b4b511b5c6..69208447d213 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) | |||
471 | ehci_writel(ehci, temp, &ehci->regs->port_status [i]); | 471 | ehci_writel(ehci, temp, &ehci->regs->port_status [i]); |
472 | } | 472 | } |
473 | 473 | ||
474 | /* msleep for 20ms only if code is trying to resume port */ | 474 | /* |
475 | * msleep for USB_RESUME_TIMEOUT ms only if code is trying to resume | ||
476 | * port | ||
477 | */ | ||
475 | if (resume_needed) { | 478 | if (resume_needed) { |
476 | spin_unlock_irq(&ehci->lock); | 479 | spin_unlock_irq(&ehci->lock); |
477 | msleep(20); | 480 | msleep(USB_RESUME_TIMEOUT); |
478 | spin_lock_irq(&ehci->lock); | 481 | spin_lock_irq(&ehci->lock); |
479 | if (ehci->shutdown) | 482 | if (ehci->shutdown) |
480 | goto shutdown; | 483 | goto shutdown; |
@@ -942,7 +945,7 @@ int ehci_hub_control( | |||
942 | temp &= ~PORT_WAKE_BITS; | 945 | temp &= ~PORT_WAKE_BITS; |
943 | ehci_writel(ehci, temp | PORT_RESUME, status_reg); | 946 | ehci_writel(ehci, temp | PORT_RESUME, status_reg); |
944 | ehci->reset_done[wIndex] = jiffies | 947 | ehci->reset_done[wIndex] = jiffies |
945 | + msecs_to_jiffies(20); | 948 | + msecs_to_jiffies(USB_RESUME_TIMEOUT); |
946 | set_bit(wIndex, &ehci->resuming_ports); | 949 | set_bit(wIndex, &ehci->resuming_ports); |
947 | usb_hcd_start_port_resume(&hcd->self, wIndex); | 950 | usb_hcd_start_port_resume(&hcd->self, wIndex); |
948 | break; | 951 | break; |