summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2014-06-23 09:39:16 +0200
committerTom Rini <trini@ti.com>2014-08-09 11:17:00 -0400
commit90fadb57237268721da2ee038a6405fcb47b277a (patch)
treefe377d22d1a87236ed4b4c7e26d4c227723e527f
parent50a35321287b476deb3335ed8cdff36771134855 (diff)
downloadu-boot-imx-90fadb57237268721da2ee038a6405fcb47b277a.zip
u-boot-imx-90fadb57237268721da2ee038a6405fcb47b277a.tar.gz
u-boot-imx-90fadb57237268721da2ee038a6405fcb47b277a.tar.bz2
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 <l.majewski@samsung.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--common/cmd_thordown.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c
index 2dd7509..8ed1dc6 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);
@@ -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;