Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / cmd / thordown.c

diff --git a/cmd/thordown.c b/cmd/thordown.c
index dd0544d475723d14ce6bd298963ca62e411d42ed..ae20dddfddba1acffe28f3f84a40eb5d4b8b4511 100644 (file)
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -7,12 +7,13 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <thor.h>
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
 
-int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        if (argc < 4)
                return CMD_RET_USAGE;
@@ -40,7 +41,8 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        ret = g_dnl_register("usb_dnl_thor");
        if (ret) {
                pr_err("g_dnl_register failed %d\n", ret);
-               return ret;
+               ret = CMD_RET_FAILURE;
+               goto exit;
        }
 
        ret = thor_init();