diff mbox series

[1/4,SRU,F/H] Revert "UBUNTU: SAUCE: Revert "usb: core: reduce power-on-good delay time of root hub""

Message ID 20210928050732.668980-2-chris.chiu@canonical.com
State New
Headers show
Series Fix cold plugged USB device on certain PCIe USB cards | expand

Commit Message

Chris Chiu Sept. 28, 2021, 5:07 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1945211

Revert this SAUCE commit since the formal fix is approved upstream.

Signed-off-by: Chris Chiu <chris.chiu@canonical.com>
---
 drivers/usb/core/hub.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 2d09298adcaf..72a7d13cffc6 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -147,8 +147,10 @@  static inline unsigned hub_power_on_good_delay(struct usb_hub *hub)
 {
 	unsigned delay = hub->descriptor->bPwrOn2PwrGood * 2;
 
-	/* Wait at least 100 msec for power to become stable */
-	return max(delay, 100U);
+	if (!hub->hdev->parent)	/* root hub */
+		return delay;
+	else /* Wait at least 100 msec for power to become stable */
+		return max(delay, 100U);
 }
 
 static inline int hub_port_debounce_be_connected(struct usb_hub *hub,