Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 997ff893603c6455da4c5e26ba1d0f81adfecdfc

Authored by Alan Stern
Committed by Greg Kroah-Hartman
1 parent ccd9509a0b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

USB: UHCI: fix for suspend of virtual HP controller 

HP's virtual UHCI host controller takes a long time to suspend
(several hundred microseconds), even when no devices are attached.
This provokes a warning message from uhci-hcd in the auto-stop case.

To prevent this from happening, this patch adds a test to avoid
performing an auto-stop when the wait_for_hp quirk flag is set.  The
controller will still suspend through the normal runtime PM mechanism.
And since that pathway includes a 1-ms delay, the slowness of the
virtual hardware won't matter.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: ZhenHua <zhen-hual@hp.com>
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/usb/host/uhci-hub.c
Diff comments   View file @ 997ff89
... ... @@ -225,7 +225,8 @@
225 225 /* auto-stop if nothing connected for 1 second */
226 226 if (any_ports_active(uhci))
227 227 uhci->rh_state = UHCI_RH_RUNNING;
228   - else if (time_after_eq(jiffies, uhci->auto_stop_time))
  228 + else if (time_after_eq(jiffies, uhci->auto_stop_time) &&
  229 + !uhci->wait_for_hp)
229 230 suspend_rh(uhci, UHCI_RH_AUTO_STOPPED);
230 231 break;
231 232