From patchwork Thu Dec 12 16:07:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3333601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 095499F2A9 for ; Thu, 12 Dec 2013 18:05:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDD0A205EE for ; Thu, 12 Dec 2013 18:05:12 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CA2F8205C7 for ; Thu, 12 Dec 2013 18:05:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8py-0002MQ-7z; Thu, 12 Dec 2013 16:10:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8pJ-0001Dx-TG; Thu, 12 Dec 2013 16:09:25 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8o6-00015z-M6 for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:08:13 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXP009K2BGX1B60@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:07:45 +0000 (GMT) X-AuditID: cbfec7f4-b7f966d0000003d9-47-52a9df51c464 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 99.EC.00985.15FD9A25; Thu, 12 Dec 2013 16:07:45 +0000 (GMT) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MXP00BIHBGQS260@eusync3.samsung.com>; Thu, 12 Dec 2013 16:07:45 +0000 (GMT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/8] clk: max77686: Fix clean-up in error and remove paths Date: Thu, 12 Dec 2013 17:07:18 +0100 Message-id: <1386864441-19561-6-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.4.3 In-reply-to: <1386864441-19561-1-git-send-email-t.figa@samsung.com> References: <1386864441-19561-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLJMWRmVeSWpSXmKPExsVy+t/xq7qB91cGGbycqWAx/8g5VouzTW/Y Le5/PcposenxNVaLGef3MVk8nXCRzeLkn15Gi9PdrBbrZ7xmceD0uHNtD5vHvJOBHpuX1Hv0 bVnF6PF5k1wAaxSXTUpqTmZZapG+XQJXxs4nh5gKVghUvP1ziamBcQdvFyMnh4SAiUTX33Ps ELaYxIV769m6GLk4hASWMkr09XxnhnD6mCR2XNvEAlLFJqAm8bnhERuILSKgITGl6zE7SBGz wBomid7NU1lBEsICvhLPr60Aa2ARUJVYcvMy0CQODl4BJ4mVz7khtilIdK75zwhicwo4S9w4 PBvMFgIq2bZ4EvsERt4FjAyrGEVTS5MLipPScw31ihNzi0vz0vWS83M3MUKC7MsOxsXHrA4x CnAwKvHwvji4IkiINbGsuDL3EKMEB7OSCO+9LSuDhHhTEiurUovy44tKc1KLDzEycXBKNTCy X6lo1RB92lPecX5fyMUL612Y84PjA+12PzPw0Gcv37rolHd5f/5p+0c9T17d32y4YlXdidv1 tzrKvltssbHjnP10/f3TCyYkuiVu858za5vUTj+mDz8dxXcs1096duyBSXRqcuSdiE3BX+qS jzfEBAkt470jvbnWIV+obabRtlXf2QsPHrdWYinOSDTUYi4qTgQAziilTRACAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_110810_828085_4866B608 X-CRM114-Status: UNSURE ( 9.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Mike Turquette , Samuel Ortiz , Sachin Kamat , Tomasz Figa , Kyungmin Park , Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes invalid kfree() and adds missing call to clk_unregister() in error and remove paths in max77686_clk_probe(). While at it, error handling is also cleaned up. Signed-off-by: Tomasz Figa Acked-by: Kyungmin Park --- drivers/clk/clk-max77686.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c index 2e6ba0e..81b3680 100644 --- a/drivers/clk/clk-max77686.c +++ b/drivers/clk/clk-max77686.c @@ -162,20 +162,9 @@ static int max77686_clk_probe(struct platform_device *pdev) clk = max77686_clk_register(&pdev->dev, max77686_clks[i]); if (IS_ERR(clk)) { ret = PTR_ERR(clk); - - switch (i) { - case MAX77686_CLK_AP: - dev_err(&pdev->dev, "Fail to register CLK_AP\n"); - goto err_clk_ap; - break; - case MAX77686_CLK_CP: - dev_err(&pdev->dev, "Fail to register CLK_CP\n"); - goto err_clk_cp; - break; - case MAX77686_CLK_PMIC: - dev_err(&pdev->dev, "Fail to register CLK_PMIC\n"); - goto err_clk_pmic; - } + dev_err(&pdev->dev, "failed to register %s\n", + max77686_clks[i]->hw.init->name); + goto err_clocks; } } @@ -183,13 +172,12 @@ static int max77686_clk_probe(struct platform_device *pdev) return 0; -err_clk_pmic: - clkdev_drop(max77686_clks[MAX77686_CLK_CP]->lookup); - kfree(max77686_clks[MAX77686_CLK_CP]->hw.clk); -err_clk_cp: - clkdev_drop(max77686_clks[MAX77686_CLK_AP]->lookup); - kfree(max77686_clks[MAX77686_CLK_AP]->hw.clk); -err_clk_ap: +err_clocks: + for (--i; i >= 0; --i) { + clkdev_drop(max77686_clks[i]->lookup); + clk_unregister(max77686_clks[i]->hw.clk); + } + return ret; } @@ -200,7 +188,7 @@ static int max77686_clk_remove(struct platform_device *pdev) for (i = 0; i < MAX77686_CLKS_NUM; i++) { clkdev_drop(max77686_clks[i]->lookup); - kfree(max77686_clks[i]->hw.clk); + clk_unregister(max77686_clks[i]->hw.clk); } return 0; }