summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/usb_hub.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/common/usb_hub.c b/common/usb_hub.c
index ffac0e743c..4875a51ace 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -36,7 +36,7 @@
#endif
#ifndef CONFIG_USB_HUB_MIN_POWER_ON_DELAY
-#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 100
+#define CONFIG_USB_HUB_MIN_POWER_ON_DELAY 1000
#endif
#define USB_BUFSIZ 512
@@ -138,8 +138,11 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
debug("port %d returns %lX\n", i + 1, dev->status);
}
- /* Wait for power to become stable */
- mdelay(max(pgood_delay, CONFIG_USB_HUB_MIN_POWER_ON_DELAY));
+ /*
+ * Wait for power to become stable,
+ * plus spec-defined max time for device to connect
+ */
+ mdelay(pgood_delay + CONFIG_USB_HUB_MIN_POWER_ON_DELAY);
}
void usb_hub_reset(void)