diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-08-23 19:03:47 +0200 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:44:08 +0900 |
commit | 4b00d5e9f002210570c1a0c03f86b407e928eb46 (patch) | |
tree | 7e47672de288f5c63a20f5283967816b62bbc740 | |
parent | cb5136cbe40b1b94c7fd806ef39baa863b88f761 (diff) | |
download | linux-3.10-4b00d5e9f002210570c1a0c03f86b407e928eb46.tar.gz linux-3.10-4b00d5e9f002210570c1a0c03f86b407e928eb46.tar.bz2 linux-3.10-4b00d5e9f002210570c1a0c03f86b407e928eb46.zip |
clk: max77686: Fix clean-up in error and remove paths
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 <t.figa@samsung.com>
-rw-r--r-- | drivers/clk/clk-max77686.c | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c index 2e6ba0e9517..81b3680b6e9 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; } |