diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-13 14:44:17 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-05-04 11:49:56 +0200 |
| commit | dc59ca097c98fb82bccf694060ace62885256e08 (patch) | |
| tree | 5147bd03e0863e9d8968ac9a3fb40764e0155c41 /drivers/usb/host/uhci-hub.c | |
| parent | 99fbbe284e4f337d198a12398549d2d142d8a42e (diff) | |
usb: host: uhci: use new USB_RESUME_TIMEOUT
commit b8fb6f79f76f478acbbffccc966daa878f172a0a upstream.
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
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 9189bc984c98..a3e9f986af6c 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c @@ -167,7 +167,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci) /* Port received a wakeup request */ set_bit(port, &uhci->resuming_ports); uhci->ports_timeout = jiffies + - msecs_to_jiffies(25); + msecs_to_jiffies(USB_RESUME_TIMEOUT); usb_hcd_start_port_resume( &uhci_to_hcd(uhci)->self, port); @@ -337,7 +337,8 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, uhci_finish_suspend(uhci, port, port_addr); /* USB v2.0 7.1.7.5 */ - uhci->ports_timeout = jiffies + msecs_to_jiffies(50); + uhci->ports_timeout = jiffies + + msecs_to_jiffies(USB_RESUME_TIMEOUT); OK(0); case USB_PORT_FEAT_POWER: /* UHCI has no power switching */ |