Patch "usb: host: uhci: use new USB_RESUME_TIMEOUT" has been added to the 3.14-stable tree

Patch "usb: host: uhci: use new USB_RESUME_TIMEOUT" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    usb: host: uhci: use new USB_RESUME_TIMEOUT

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-host-uhci-use-new-usb_resume_timeout.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>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
@@ -165,7 +165,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);
 
@@ -337,7 +337,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 */


Patches currently in stable-queue which might be from balbi@ti.com are

queue-3.14/usb-host-xhci-use-new-usb_resume_timeout.patch
queue-3.14/usb-dwc2-hcd-use-new-usb_resume_timeout.patch
queue-3.14/usb-host-sl811-use-new-usb_resume_timeout.patch
queue-3.14/usb-define-a-generic-usb_resume_timeout-macro.patch
queue-3.14/usb-host-isp116x-use-new-usb_resume_timeout.patch
queue-3.14/usb-gadget-composite-enable-besl-support.patch
queue-3.14/usb-host-r8a66597-use-new-usb_resume_timeout.patch
queue-3.14/usb-core-hub-use-new-usb_resume_timeout.patch
queue-3.14/usb-host-fusbh200-use-new-usb_resume_timeout.patch
queue-3.14/usb-host-uhci-use-new-usb_resume_timeout.patch
queue-3.14/usb-host-fotg210-use-new-usb_resume_timeout.patch
queue-3.14/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch