]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
authorWang Hai <wanghai38@huawei.com>
Mon, 10 Aug 2020 02:57:05 +0000 (10:57 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Aug 2020 17:36:47 +0000 (10:36 -0700)
Fix the missing clk_disable_unprepare() before return
from emac_clks_phase1_init() in the error handling case.

Fixes: 537813f6160a ("net: emac: emac gigabit ethernet controller driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Acked-by: Timur Tabi <timur@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qualcomm/emac/emac.c

index 20b1b43a0e3930a1f2769881f86baf2c645ac912..1166b98d8bb2c3e79fce24aa43793699c97e0137 100644 (file)
@@ -474,13 +474,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev,
 
        ret = clk_prepare_enable(adpt->clk[EMAC_CLK_CFG_AHB]);
        if (ret)
-               return ret;
+               goto disable_clk_axi;
 
        ret = clk_set_rate(adpt->clk[EMAC_CLK_HIGH_SPEED], 19200000);
        if (ret)
-               return ret;
+               goto disable_clk_cfg_ahb;
+
+       ret = clk_prepare_enable(adpt->clk[EMAC_CLK_HIGH_SPEED]);
+       if (ret)
+               goto disable_clk_cfg_ahb;
 
-       return clk_prepare_enable(adpt->clk[EMAC_CLK_HIGH_SPEED]);
+       return 0;
+
+disable_clk_cfg_ahb:
+       clk_disable_unprepare(adpt->clk[EMAC_CLK_CFG_AHB]);
+disable_clk_axi:
+       clk_disable_unprepare(adpt->clk[EMAC_CLK_AXI]);
+
+       return ret;
 }
 
 /* Enable clocks; needs emac_clks_phase1_init to be called before */