From patchwork Mon Jun 23 07:39:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Majewski?= X-Patchwork-Id: 362682 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B60CA14008F for ; Mon, 23 Jun 2014 17:39:49 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 423FA4B7EA; Mon, 23 Jun 2014 09:39:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D-Nwryhkhjbi; Mon, 23 Jun 2014 09:39:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C03874B7ED; Mon, 23 Jun 2014 09:39:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65C2A4B7F4 for ; Mon, 23 Jun 2014 09:39:38 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j1Fth0xehIIp for ; Mon, 23 Jun 2014 09:39:35 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTPS id D95164B7EA for ; Mon, 23 Jun 2014 09:39:30 +0200 (CEST) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7M00BS22LPKNC0@mailout4.samsung.com> for u-boot@lists.denx.de; Mon, 23 Jun 2014 16:39:25 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-08-53a7d9adad2c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 0B.6D.04943.DA9D7A35; Mon, 23 Jun 2014 16:39:25 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N7M00JOA2LI68N0@mmp2.samsung.com>; Mon, 23 Jun 2014 16:39:25 +0900 (KST) From: Lukasz Majewski To: u-boot@lists.denx.de, Stephen Warren Date: Mon, 23 Jun 2014 09:39:15 +0200 Message-id: <1403509156-18822-1-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1403249700-16802-1-git-send-email-l.majewski@samsung.com> References: <1403249700-16802-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKLMWRmVeSWpSXmKPExsVy+t9jQd21N5cHG0zZY2jx5hG3xZuHmxkt 3rQ1MlrsuHyDxeLG9BZWi1cH21gs3u7tZHdg95g36wSLx9k7Oxg91k17y+zR2/yOzaNvyypG j41zQwPYorhsUlJzMstSi/TtErgyfj3uYSvYyFVxcU4TWwPjYY4uRg4OCQETiT39EV2MnECm mMSFe+vZQGwhgemMEmc/13QxcgHZXUwSEzZsZAdJsAnoSXy++5QJxBYRcJCYeekoC0gRs8Ax RolXk/8xgQwVFnCTmPg0CKSGRUBVYvuPbYwgYV6g8JQN+RC7FCW6n00A28Up4C5x7vNlRoi9 bhLfT8xgncDIu4CRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGcGA9k9rBuLLB4hCjAAej Eg+vhtvyYCHWxLLiytxDjBIczEoivI0NQCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8B1qtA4UE 0hNLUrNTUwtSi2CyTBycUg2MamF/GuasyfU+6N9YrdEuvZ3n+c1lep+cDn+Ydnft/yebss+z sljz91rY1Ih+jlaYIj9jzYrGefbfXKbv3ClqmXb6SPmuh1+OVB6bGSbOo2BerWPUy5r74tuT f6muNmvXeFkX6IV6v14vwuS97p6ZcqaG+95PNY9vXGP9Jbpqf8Fp04mMyqe6lViKMxINtZiL ihMBbmHtZigCAAA= Cc: Marek Vasut , Stephen Warren , Przemyslaw Marczak Subject: [U-Boot] [PATCH v2] thor: defer parsing of device string to IO backend X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de 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 --- common/cmd_thordown.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 96f7d32..27927ba 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;