diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-18 00:26:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-18 00:26:44 +0200 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /drivers/usb/early/ehci-dbgp.c | |
| parent | ASoC: wm8994: Add bytes controls for DRC (diff) | |
| parent | blackfin: add platform device for ad1836 machine driver (diff) | |
| download | linux-6bf6d1af86e7dec914f7916f2a00910650a73469.tar.xz linux-6bf6d1af86e7dec914f7916f2a00910650a73469.zip | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'drivers/usb/early/ehci-dbgp.c')
| -rw-r--r-- | drivers/usb/early/ehci-dbgp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c index ee0ebacf8227..89dcf155d57e 100644 --- a/drivers/usb/early/ehci-dbgp.c +++ b/drivers/usb/early/ehci-dbgp.c @@ -450,7 +450,7 @@ static int dbgp_ehci_startup(void) writel(FLAG_CF, &ehci_regs->configured_flag); /* Wait until the controller is no longer halted */ - loop = 10; + loop = 1000; do { status = readl(&ehci_regs->status); if (!(status & STS_HALT)) |