diff mbox

[v1,1/1] usb: hub: Don't wait for connect state at resume for powered-off ports

Message ID 1087e55507b290d9d22d6d2d53cff0a11b152e1c.1523641017.git.sathyanarayanan.kuppuswamy@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kuppuswamy Sathyanarayanan April 13, 2018, 5:42 p.m. UTC
From: Dominik Bozek <dominikx.bozek@intel.com>

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>
 drivers/usb/core/hub.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox


diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c5c1f6c..bd2b136 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3367,6 +3367,10 @@  static int wait_for_connected(struct usb_device *udev,
 	while (delay_ms < 2000) {
 		if (status || *portstatus & USB_PORT_STAT_CONNECTION)
+		if (!port_is_power_on(hub, *portstatus)) {
+			status = -ENODEV;
+			break;
+		}
 		delay_ms += 20;
 		status = hub_port_status(hub, *port1, portstatus, portchange);