Commit 5d111f51 authored Apr 13, 2018 by Dominik Bozek Committed by Greg Kroah-Hartman Apr 22, 2018

usb: hub: Don't wait for connect state at resume for powered-off ports



wait_for_connected() wait till a port change status to
USB_PORT_STAT_CONNECTION, but this is not possible if
the port is unpowered. The loop will only exit at timeout.

Such case take place if an over-current incident happen
while system is in S3. Then during resume wait_for_connected()
will wait 2s, which may be noticeable by the user.

Signed-off-by: Dominik Bozek <dominikx.bozek@intel.com>
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f86c6888

drivers/usb/core/hub.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3371,6 +3371,10 @@ static int wait_for_connected(struct usb_device *udev,
		while (delay_ms < 2000) {
		if (status \|\| *portstatus & USB_PORT_STAT_CONNECTION)
		break;
		if (!port_is_power_on(hub, *portstatus)) {
		status = -ENODEV;
		break;
		}
		msleep(20);
		delay_ms += 20;
		status = hub_port_status(hub, *port1, portstatus, portchange);

Admin message