Patch "usb: musb: use new USB_RESUME_TIMEOUT" has been added to the 3.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: musb: 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-musb-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 <[email protected]> know about it.
Quoted 1 line
From
309be239369609929d5d3833ee043f7c5afc95d1Mon Sep 17 00:00:00 2001
From: Felipe Balbi <[email protected]>
Date: Fri, 13 Feb 2015 14:46:27 -0600
Subject: usb: musb: use new USB_RESUME_TIMEOUT
From: Felipe Balbi <[email protected]>
commit 309be239369609929d5d3833ee043f7c5afc95d1 upstream.
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Based on original work by Bin Liu <Bin Liu <[email protected]>>
--- drivers/usb/musb/musb_core.c | 6 ++++-- drivers/usb/musb/musb_virthub.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/musb/musb_core.c +4 -2
@@ -99,6 +99,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/dma-mapping.h> +#include <linux/usb.h> #include "musb_core.h"
@@ -477,10 +478,11 @@ static irqreturn_t musb_stage0_irq(struc (USB_PORT_STAT_C_SUSPEND <<16 ) |MUSB_PORT_STAT_RESUME ; musb->rh_timer = jiffies - +msecs_to_jiffies (20 ); + +msecs_to_jiffies (USB_RESUME_TIMEOUT ); +schedule_delayed_work ( &musb->finish_resume_work, -msecs_to_jiffies (20 )); +msecs_to_jiffies (USB_RESUME_TIMEOUT )); musb->xceiv->state =OTG_STATE_A_HOST ; musb->is_active =1 ;
drivers/usb/musb/musb_virthub.c +1 -1
@@ -136,7 +136,7 @@ void musb_port_suspend(struct musb *musb/* later, GetPortStatus will stop RESUME signaling */ musb->port1_status |=MUSB_PORT_STAT_RESUME ;schedule_delayed_work (&musb->finish_resume_work, -msecs_to_jiffies (20 )); +msecs_to_jiffies (USB_RESUME_TIMEOUT )); } }
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/usb-musb-use-new-usb_resume_timeout.patch queue-3.14/usb-host-oxu210hp-use-new-usb_resume_timeout.patch queue-3.14/usb-host-ehci-use-new-usb_resume_timeout.patch