| From b8fb6f79f76f478acbbffccc966daa878f172a0a Mon Sep 17 00:00:00 2001 |
| From: Felipe Balbi <balbi@ti.com> |
| Date: Fri, 13 Feb 2015 14:44:17 -0600 |
| Subject: usb: host: uhci: use new USB_RESUME_TIMEOUT |
| |
| From: Felipe Balbi <balbi@ti.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/uhci-hub.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| /* 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_h |
| 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 */ |
