clk: keystone: pll: Unmap region obtained by of_iomap

Commit Message

Arvind Yadav Sept. 20, 2016, 11:46 a.m. UTC

From: Arvind Yadav <[e-mail]>

Free memory mapping, if of_pll_div_clk_init is not successful.

Signed-off-by: Arvind Yadav <[e-mail]>
---
 drivers/clk/keystone/pll.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Stephen Boyd Dec. 9, 2016, 12:34 a.m. UTC | #1

On 09/20, Arvind Yadav wrote:
> From: Arvind Yadav <[e-mail]>
> 
> Free memory mapping, if of_pll_div_clk_init is not successful.
> 
> Signed-off-by: Arvind Yadav <[e-mail]>
> ---

Applied to clk-next

Patch

diff --git a/drivers/clk/keystone/pll.c b/drivers/clk/keystone/pll.c
index a26ba21..cba9a0e 100644
--- a/drivers/clk/keystone/pll.c
+++ b/drivers/clk/keystone/pll.c
@@ -267,25 +267,30 @@  static void __init of_pll_div_clk_init(struct device_node *node)
 	parent_name = of_clk_get_parent_name(node, 0);
 	if (!parent_name) {
 		pr_err("%s: missing parent clock\n", __func__);
+		iounmap(reg);
 		return;
 	}
 
 	if (of_property_read_u32(node, "bit-shift", &shift)) {
 		pr_err("%s: missing 'shift' property\n", __func__);
+		iounmap(reg);
 		return;
 	}
 
 	if (of_property_read_u32(node, "bit-mask", &mask)) {
 		pr_err("%s: missing 'bit-mask' property\n", __func__);
+		iounmap(reg);
 		return;
 	}
 
 	clk = clk_register_divider(NULL, clk_name, parent_name, 0, reg, shift,
 				 mask, 0, NULL);
-	if (clk)
+	if (clk) {
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
-	else
+	} else {
 		pr_err("%s: error registering divider %s\n", __func__, clk_name);
+		iounmap(reg);
+	}
 }
 CLK_OF_DECLARE(pll_divider_clock, "ti,keystone,pll-divider-clock", of_pll_div_clk_init);