summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:59 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:59 +0200
commitf77269a819b1306aa9e0721a2159693fe307142d (patch)
tree513999c970f50efa9f7400f84b8094126ef7e05e
parent40830caf4edc6d7b4bb4e61833139038df4f9ee4 (diff)
parent7212fa7d4273155aaa0de99ecd4cd040396acb19 (diff)
downloadbarebox-f77269a819b1306aa9e0721a2159693fe307142d.tar.gz
barebox-f77269a819b1306aa9e0721a2159693fe307142d.tar.xz
Merge branch 'for-next/usb'
-rw-r--r--drivers/usb/core/usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 81ae9f18c2..48bc121160 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -948,7 +948,8 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER);
USB_HUB_PRINTF("port %d returns %lX\n", i + 1, dev->status);
}
- mdelay(20);
+ /* power on is encoded in 2ms increments -> times 2 for the actual delay */
+ mdelay(hub->desc.bPwrOn2PwrGood*2);
}
#define MAX_TRIES 5