FAILED: patch "[PATCH] usb: host: uhci: use new USB_RESUME_TIMEOUT" failed to apply to 3.10-stable tree

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

Subsystems (3)

Stable branch USB USB uhci driver

lore

Share & tools

lore

[email protected]

author maintainer

2015-05-02 13:16 UTC #0 lore raw

The patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

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: [PATCH] usb: host: uhci: use new USB_RESUME_TIMEOUT

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

Cc <[email protected]> # v3.10+

Signed-off-by Felipe Balbi <[email protected]>

drivers/usb/host/uhci-hub.c +3 -2

index 19ba5eafb31e..7b3d1afcc14a 100644
@@ -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 */