diff options
| author | Tom Rini <trini@ti.com> | 2014-05-06 14:45:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-06 14:45:51 -0400 |
| commit | 3c3f13f81942134edff280fcb5e7137c623e7dac (patch) | |
| tree | b4c23dce6db18c7942f309c32cd80b8db31ba95d /common/cmd_usb_mass_storage.c | |
| parent | 52fded7b94d98c73a824e4a9d90596a33a1cbb8a (diff) | |
| parent | af41d6b4cb1602abebaaa9c8774a9b0ece564796 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common/cmd_usb_mass_storage.c')
| -rw-r--r-- | common/cmd_usb_mass_storage.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 5f557d5f85..d8d9efd4f6 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -40,15 +40,19 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; } - g_dnl_register("ums"); + g_dnl_register("usb_dnl_ums"); /* Timeout unit: seconds */ int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT; - if (!usb_cable_connected()) { + if (!g_dnl_board_usb_cable_connected()) { + /* + * Won't execute if we don't know whether the cable is + * connected. + */ puts("Please connect USB cable.\n"); - while (!usb_cable_connected()) { + while (!g_dnl_board_usb_cable_connected()) { if (ctrlc()) { puts("\rCTRL+C - Operation aborted.\n"); goto exit; |