thor: defer parsing of device string to IO backend 60/63960/5
authorLukasz Majewski <l.majewski@samsung.com>
Mon, 23 Jun 2014 07:39:16 +0000 (09:39 +0200)
committerJoonyoung Shim <jy0922.shim@samsung.com>
Fri, 1 Apr 2016 01:07:55 +0000 (18:07 -0700)
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>
Conflicts:
common/cmd_thordown.c

[jino.cho: Fixed conflicts from original commit of tizen.org]
Signed-off-by: jino.cho <jino.cho@samsung.com>
Change-Id: I8478952aaa6968b2684d06e1a6ca7f082771db33

common/cmd_thordown.c

index 2d4f58aeb32b4d6b689a53b8d7b582c4449275e4..436b7f56315eb5985016d4d597c6c8ba94959885 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);