Merge tag 'usb-for-v4.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-testing

Felipe writes:

usb: generic resume timeout for v4.1

This part 2 pull request contains only the patches
which make sure everybody on linux uses the same
resume timeout value.

Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index a7cc0221e003..ece9e37e89fe 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)
                                 /* 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);
 
@@ -338,7 +338,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);
                         break;
                 case USB_PORT_FEAT_POWER:
                         /* UHCI has no power switching */