thor: defer parsing of device string to IO backend
authorLukasz Majewski <l.majewski@samsung.com>
Mon, 23 Jun 2014 07:39:16 +0000 (09:39 +0200)
committerTom Rini <trini@ti.com>
Sat, 9 Aug 2014 15:17:00 +0000 (11:17 -0400)
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed
the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c
to match that change.

Also, apply the same change as commit d6d37d737b58e "dfu: free entities
when parsing fails" to cmd_thordown.c.

Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
common/cmd_thordown.c

index 2dd750928e41ad39c2a924b38140c898f5c114e7..8ed1dc6f9e47a4089885b4232d85bcaa7b3ab3b6 100644 (file)
@@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        puts("TIZEN \"THOR\" Downloader\n");
 
-       ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-                                                             NULL, 10));
+       ret = dfu_init_env_entities(interface, devstring);
        if (ret)
-               return ret;
+               goto done;
 
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
        ret = board_usb_init(controller_index, USB_INIT_DEVICE);
@@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 exit:
        g_dnl_unregister();
+done:
        dfu_free_entities();
 
        return ret;