Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 997ff893 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: default avatarZhenHua <zhen-hual@hp.com>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ccd9509a

drivers/usb/host/uhci-hub.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -225,7 +225,8 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf) 
		/* auto-stop if nothing connected for 1 second */

		/* auto-stop if nothing connected for 1 second */

		if (any_ports_active(uhci))

		if (any_ports_active(uhci))

			uhci->rh_state = UHCI_RH_RUNNING;

			uhci->rh_state = UHCI_RH_RUNNING;

		else if (time_after_eq(jiffies, uhci->auto_stop_time))

		else if (time_after_eq(jiffies, uhci->auto_stop_time) &&

				!uhci->wait_for_hp)

			suspend_rh(uhci, UHCI_RH_AUTO_STOPPED);

			suspend_rh(uhci, UHCI_RH_AUTO_STOPPED);

		break;

		break;