]>
Commit | Line | Data |
---|---|---|
6bc90f43 GKH |
1 | From b8fb6f79f76f478acbbffccc966daa878f172a0a Mon Sep 17 00:00:00 2001 |
2 | From: Felipe Balbi <balbi@ti.com> | |
3 | Date: Fri, 13 Feb 2015 14:44:17 -0600 | |
4 | Subject: usb: host: uhci: use new USB_RESUME_TIMEOUT | |
5 | ||
6 | From: Felipe Balbi <balbi@ti.com> | |
7 | ||
8 | commit b8fb6f79f76f478acbbffccc966daa878f172a0a upstream. | |
9 | ||
10 | Make sure we're using the new macro, so our | |
11 | resume signaling will always pass certification. | |
12 | ||
13 | Signed-off-by: Felipe Balbi <balbi@ti.com> | |
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
15 | ||
16 | --- | |
17 | drivers/usb/host/uhci-hub.c | 5 +++-- | |
18 | 1 file changed, 3 insertions(+), 2 deletions(-) | |
19 | ||
20 | --- a/drivers/usb/host/uhci-hub.c | |
21 | +++ b/drivers/usb/host/uhci-hub.c | |
22 | @@ -165,7 +165,7 @@ static void uhci_check_ports(struct uhci | |
23 | /* Port received a wakeup request */ | |
24 | set_bit(port, &uhci->resuming_ports); | |
25 | uhci->ports_timeout = jiffies + | |
26 | - msecs_to_jiffies(25); | |
27 | + msecs_to_jiffies(USB_RESUME_TIMEOUT); | |
28 | usb_hcd_start_port_resume( | |
29 | &uhci_to_hcd(uhci)->self, port); | |
30 | ||
31 | @@ -337,7 +337,8 @@ static int uhci_hub_control(struct usb_h | |
32 | uhci_finish_suspend(uhci, port, port_addr); | |
33 | ||
34 | /* USB v2.0 7.1.7.5 */ | |
35 | - uhci->ports_timeout = jiffies + msecs_to_jiffies(50); | |
36 | + uhci->ports_timeout = jiffies + | |
37 | + msecs_to_jiffies(USB_RESUME_TIMEOUT); | |
38 | break; | |
39 | case USB_PORT_FEAT_POWER: | |
40 | /* UHCI has no power switching */ |