Skip to contentSkip to conversation

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

PATCH [email protected] 1 participant 1 message May 2, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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.19-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.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b8fb6f79f76f478acbbffccc966daa878f172a0a Mon Sep 17 00:00:00 2001

From: Felipe Balbi <[email protected]>
Date: Fri, 13 Feb 2015 14:44:17 -0600
Subject: usb: host: uhci: use new USB_RESUME_TIMEOUT

From: Felipe Balbi <[email protected]>

commit b8fb6f79f76f478acbbffccc966daa878f172a0a upstream.

Make sure we're using the new macro, so our
resume signaling will always pass certification.

---
 drivers/usb/host/uhci-hub.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/uhci-hub.c +3 -2
@@ -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 [email protected] are

queue-3.19/usb-host-xhci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-sl811-use-new-usb_resume_timeout.patch queue-3.19/usb-musb-use-new-usb_resume_timeout.patch queue-3.19/usb-define-a-generic-usb_resume_timeout-macro.patch queue-3.19/usb-host-oxu210hp-use-new-usb_resume_timeout.patch queue-3.19/usb-host-isp116x-use-new-usb_resume_timeout.patch queue-3.19/usb-host-r8a66597-use-new-usb_resume_timeout.patch queue-3.19/usb-musb-core-fix-tx-rx-endpoint-order.patch queue-3.19/usb-core-hub-use-new-usb_resume_timeout.patch queue-3.19/usb-host-fusbh200-use-new-usb_resume_timeout.patch queue-3.19/usb-gadget-printer-enqueue-printer-s-response-for-setup-request.patch queue-3.19/usb-host-ehci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-uhci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-fotg210-use-new-usb_resume_timeout.patch queue-3.19/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch