| Message ID | 20200806140647.43099-1-wanghai38@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net] net: qcom/emac: Fix missing clk_disable_unprepare() in error path of emac_probe | expand |
On 8/6/20 9:06 AM, Wang Hai wrote: > In emac_clks_phase1_init() of emac_probe(), there may be a situation > in which some clk_prepare_enable() succeed and others fail. > If emac_clks_phase1_init() fails, goto err_undo_clocks to clean up > the clk that was successfully clk_prepare_enable(). Good catch, however, I think the proper fix is to fix this in emac_clks_phase1_init(), so that if some clocks fail, the other clocks are cleaned up and then an error is returned.
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c index 20b1b43a0e39..7520c02eec12 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac.c @@ -628,7 +628,7 @@ static int emac_probe(struct platform_device *pdev) ret = emac_clks_phase1_init(pdev, adpt); if (ret) { dev_err(&pdev->dev, "could not initialize clocks\n"); - goto err_undo_netdev; + goto err_undo_clocks; } netdev->watchdog_timeo = EMAC_WATCHDOG_TIME;
In emac_clks_phase1_init() of emac_probe(), there may be a situation in which some clk_prepare_enable() succeed and others fail. If emac_clks_phase1_init() fails, goto err_undo_clocks to clean up the clk that was successfully clk_prepare_enable(). Fixes: b9b17debc69d ("net: emac: emac gigabit ethernet controller driver") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> --- drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)