Skip to content

Commit 50caa77

Browse files
Wang Haidavem330
authored andcommitted
net: qcom/emac: add missed clk_disable_unprepare in error path of emac_clks_phase1_init
Fix the missing clk_disable_unprepare() before return from emac_clks_phase1_init() in the error handling case. Fixes: b9b17de ("net: emac: emac gigabit ethernet controller driver") Reported-by: Hulk Robot <[email protected]> Signed-off-by: Wang Hai <[email protected]> Acked-by: Timur Tabi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e716420 commit 50caa77

File tree

1 file changed

+14
-3
lines changed
  • drivers/net/ethernet/qualcomm/emac

1 file changed

+14
-3
lines changed

drivers/net/ethernet/qualcomm/emac/emac.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,24 @@ static int emac_clks_phase1_init(struct platform_device *pdev,
474474

475475
ret = clk_prepare_enable(adpt->clk[EMAC_CLK_CFG_AHB]);
476476
if (ret)
477-
return ret;
477+
goto disable_clk_axi;
478478

479479
ret = clk_set_rate(adpt->clk[EMAC_CLK_HIGH_SPEED], 19200000);
480480
if (ret)
481-
return ret;
481+
goto disable_clk_cfg_ahb;
482+
483+
ret = clk_prepare_enable(adpt->clk[EMAC_CLK_HIGH_SPEED]);
484+
if (ret)
485+
goto disable_clk_cfg_ahb;
482486

483-
return clk_prepare_enable(adpt->clk[EMAC_CLK_HIGH_SPEED]);
487+
return 0;
488+
489+
disable_clk_cfg_ahb:
490+
clk_disable_unprepare(adpt->clk[EMAC_CLK_CFG_AHB]);
491+
disable_clk_axi:
492+
clk_disable_unprepare(adpt->clk[EMAC_CLK_AXI]);
493+
494+
return ret;
484495
}
485496

486497
/* Enable clocks; needs emac_clks_phase1_init to be called before */

0 commit comments

Comments
 (0)