From 5f875d046effd8382689fedd5bf26bde060f378a Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Mon, 23 Jun 2014 09:39:16 +0200 Subject: [PATCH] thor: defer parsing of device string to IO backend 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 Reviewed-by: Stephen Warren Conflicts: common/cmd_thordown.c [jino.cho: Fixed conflicts from original commit of tizen.org] Signed-off-by: jino.cho Change-Id: I8478952aaa6968b2684d06e1a6ca7f082771db33 --- common/cmd_thordown.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 2d4f58aeb..436b7f563 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -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); -- 2.34.1