luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ethernet: arc: fix error handling in emac_rockchip_probe

Browse Source 
If clk_set_rate() fails, we should disable clk before return.
Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Branislav Radocaj <branislav@radocaj.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Branislav Radocaj 2017-12-07 00:07:38 +01:00 committed by David S. Miller
parent 589bf32f09
commit e46772a694
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/arc/emac_rockchip.c
View File

@ -220,9 +220,11 @@ static int emac_rockchip_probe(struct platform_device *pdev)
/* RMII TX/RX needs always a rate of 25MHz */ /* RMII TX/RX needs always a rate of 25MHz */
err = clk_set_rate(priv->macclk, 25000000); err = clk_set_rate(priv->macclk, 25000000);
if (err) if (err) {
dev_err(dev, dev_err(dev,
"failed to change mac clock rate (%d)\n", err); "failed to change mac clock rate (%d)\n", err);
goto out_clk_disable_macclk;
}
} }
err = arc_emac_probe(ndev, interface); err = arc_emac_probe(ndev, interface);
@ -232,7 +234,8 @@ static int emac_rockchip_probe(struct platform_device *pdev)
} }
return 0; return 0;
out_clk_disable_macclk:
clk_disable_unprepare(priv->macclk);
out_regulator_disable: out_regulator_disable:
if (priv->regulator) if (priv->regulator)
regulator_disable(priv->regulator); regulator_disable(priv->regulator);