Skip to content

Commit

Permalink
clk:mmp:clk-of-mmp2: Free memory and Unmap region obtained by kzalloc…
Browse files Browse the repository at this point in the history
… and of_iomap

Free memory and memory mapping , if mmp2_clk_init is not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
[sboyd@codeaurora.org: Put return at the right place]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
  • Loading branch information
Arvind Yadav authored and Stephen Boyd committed Dec 9, 2016
1 parent 19b9f29 commit 81ba3cc
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/clk/mmp/clk-of-mmp2.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,19 @@ static void __init mmp2_clk_init(struct device_node *np)
pxa_unit->mpmu_base = of_iomap(np, 0);
if (!pxa_unit->mpmu_base) {
pr_err("failed to map mpmu registers\n");
return;
goto free_memory;
}

pxa_unit->apmu_base = of_iomap(np, 1);
if (!pxa_unit->apmu_base) {
pr_err("failed to map apmu registers\n");
return;
goto unmap_mpmu_region;
}

pxa_unit->apbc_base = of_iomap(np, 2);
if (!pxa_unit->apbc_base) {
pr_err("failed to map apbc registers\n");
return;
goto unmap_apmu_region;
}

mmp_clk_init(np, &pxa_unit->unit, MMP2_NR_CLKS);
Expand All @@ -333,6 +333,15 @@ static void __init mmp2_clk_init(struct device_node *np)
mmp2_axi_periph_clk_init(pxa_unit);

mmp2_clk_reset_init(np, pxa_unit);

return;

unmap_apmu_region:
iounmap(pxa_unit->apmu_base);
unmap_mpmu_region:
iounmap(pxa_unit->mpmu_base);
free_memory:
kfree(pxa_unit);
}

CLK_OF_DECLARE(mmp2_clk, "marvell,mmp2-clock", mmp2_clk_init);

0 comments on commit 81ba3cc

Please sign in to comment.