diff options
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
| -rw-r--r-- | drivers/usb/host/uhci-hub.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index 19ba5eafb31e..7b3d1afcc14a 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c | |||
| @@ -166,7 +166,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci) | |||
| 166 | /* Port received a wakeup request */ | 166 | /* Port received a wakeup request */ |
| 167 | set_bit(port, &uhci->resuming_ports); | 167 | set_bit(port, &uhci->resuming_ports); |
| 168 | uhci->ports_timeout = jiffies + | 168 | uhci->ports_timeout = jiffies + |
| 169 | msecs_to_jiffies(25); | 169 | msecs_to_jiffies(USB_RESUME_TIMEOUT); |
| 170 | usb_hcd_start_port_resume( | 170 | usb_hcd_start_port_resume( |
| 171 | &uhci_to_hcd(uhci)->self, port); | 171 | &uhci_to_hcd(uhci)->self, port); |
| 172 | 172 | ||
| @@ -338,7 +338,8 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, | |||
| 338 | uhci_finish_suspend(uhci, port, port_addr); | 338 | uhci_finish_suspend(uhci, port, port_addr); |
| 339 | 339 | ||
| 340 | /* USB v2.0 7.1.7.5 */ | 340 | /* USB v2.0 7.1.7.5 */ |
| 341 | uhci->ports_timeout = jiffies + msecs_to_jiffies(50); | 341 | uhci->ports_timeout = jiffies + |
| 342 | msecs_to_jiffies(USB_RESUME_TIMEOUT); | ||
| 342 | break; | 343 | break; |
| 343 | case USB_PORT_FEAT_POWER: | 344 | case USB_PORT_FEAT_POWER: |
| 344 | /* UHCI has no power switching */ | 345 | /* UHCI has no power switching */ |