diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
| commit | 7e8f270292ebacb25f366181f2022c819e5c7586 (patch) | |
| tree | 841cf474e29eedf6c173da8d1901d3b24d06ecbd /drivers/usb/musb-new/musb_uboot.c | |
| parent | e16e137c377c8b96d8d91263d0b6d8470169f841 (diff) | |
| parent | 192eab9357473e09218e0a4448b220d691d9d886 (diff) | |
| download | talos-obmc-uboot-7e8f270292ebacb25f366181f2022c819e5c7586.tar.gz talos-obmc-uboot-7e8f270292ebacb25f366181f2022c819e5c7586.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/musb-new/musb_uboot.c')
| -rw-r--r-- | drivers/usb/musb-new/musb_uboot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 233a0e4a5e..6ce528c81e 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -237,8 +237,10 @@ int musb_lowlevel_init(struct musb_host_data *host) if (musb_readb(mbase, MUSB_DEVCTL) & MUSB_DEVCTL_HM) break; } while (get_timer(0) < timeout); - if (get_timer(0) >= timeout) + if (get_timer(0) >= timeout) { + musb_stop(host->host); return -ENODEV; + } _musb_reset_root_port(host, NULL); host->host->is_active = 1; |
