]> git.karo-electronics.de Git - linux-beck.git/commitdiff
clk:mmp:clk-of-mmp2: Free memory and Unmap region obtained by kzalloc and of_iomap
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Tue, 20 Sep 2016 11:08:58 +0000 (16:38 +0530)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 9 Dec 2016 00:29:39 +0000 (16:29 -0800)
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>
drivers/clk/mmp/clk-of-mmp2.c

index 9adaf48aea2317625a520bb42635fa8362946893..0fc75c39595708f0d5c6296fcbeea4e3d61f5731 100644 (file)
@@ -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);
@@ -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);