diff options
| author | Dominik Bozek <[email protected]> | 2018-04-13 17:42:31 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2018-04-22 14:03:21 +0000 |
| commit | 5d111f5190848d6fb1c414dc57797efea3526a2f (patch) | |
| tree | b3176a1621d0111ba02ae263618cf9d28efd54df /drivers/usb/core/hub.c | |
| parent | usb: mtu3: simplify getting .drvdata (diff) | |
| download | kernel-5d111f5190848d6fb1c414dc57797efea3526a2f.tar.gz kernel-5d111f5190848d6fb1c414dc57797efea3526a2f.zip | |
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 <[email protected]>
Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index f6ea16e9f6bb..9e79bcf03cde 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -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); |