Skip to contentSkip to conversation

FAILED: patch "[PATCH] usb: isp1760: hcd: use new USB_RESUME_TIMEOUT" failed to apply to 3.14-stable tree

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

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 3.14-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 59c9904cce77b55892e15f40791f1e66e4d3a1e6 Mon Sep 17 00:00:00 2001

From: Felipe Balbi <[email protected]>
Date: Fri, 13 Feb 2015 15:04:06 -0600
Subject: [PATCH] usb: isp1760: hcd: use new USB_RESUME_TIMEOUT

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

drivers/usb/isp1760/isp1760-hcd.c +1 -1
index 3cb98b1d5d29..7911b6b6fe40 100644
@@ -1869,7 +1869,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq,
 				reg_write32(hcd->regs, HC_PORTSC1,
 							temp | PORT_RESUME);
 				priv->reset_done = jiffies +
-					msecs_to_jiffies(20);
+					msecs_to_jiffies(USB_RESUME_TIMEOUT);
 			}
 			break;
 		case USB_PORT_FEAT_C_SUSPEND: