Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[karo-tx-uboot.git] / common / cmd_dfu.c

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 5547678208adf8753800bf76f68b4f7ad34869b8..2633b30e556f4be8dd685405eb472c4a63acd725 100644 (file)
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -22,14 +22,13 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char *interface = argv[2];
        char *devstring = argv[3];
 
-       char *s = "dfu";
        int ret, i = 0;
 
-       ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-                                                             NULL, 10));
+       ret = dfu_init_env_entities(interface, devstring);
        if (ret)
-               return ret;
+               goto done;
 
+       ret = CMD_RET_SUCCESS;
        if (argc > 4 && strcmp(argv[4], "list") == 0) {
                dfu_show_entities();
                goto done;
@@ -38,7 +37,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
        board_usb_init(controller_index, USB_INIT_DEVICE);
 
-       g_dnl_register(s);
+       g_dnl_register("usb_dnl_dfu");
        while (1) {
                if (dfu_reset())
                        /*
@@ -62,7 +61,7 @@ done:
        if (dfu_reset())
                run_command("reset", 0);
 
-       return CMD_RET_SUCCESS;
+       return ret;
 }
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,