diff options
| author | Branislav Radocaj <branislav@radocaj.org> | 2017-12-06 18:07:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-07 13:51:09 -0500 |
| commit | e46772a6946a7d1f3fbbc1415871851d6651f1d4 (patch) | |
| tree | 28c78ec43830de6dba6532ecd8d4c99646eb621b /drivers/net/ethernet/arc | |
| parent | 589bf32f09852041fbd3b7ce1a9e703f95c230ba (diff) | |
net: ethernet: arc: fix error handling in emac_rockchip_probe
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>
Diffstat (limited to 'drivers/net/ethernet/arc')
| -rw-r--r-- | drivers/net/ethernet/arc/emac_rockchip.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index e278e3d96ee0..c6163874e4e7 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c | |||
| @@ -220,9 +220,11 @@ static int emac_rockchip_probe(struct platform_device *pdev) | |||
| 220 | 220 | ||
| 221 | /* RMII TX/RX needs always a rate of 25MHz */ | 221 | /* RMII TX/RX needs always a rate of 25MHz */ |
| 222 | err = clk_set_rate(priv->macclk, 25000000); | 222 | err = clk_set_rate(priv->macclk, 25000000); |
| 223 | if (err) | 223 | if (err) { |
| 224 | dev_err(dev, | 224 | dev_err(dev, |
| 225 | "failed to change mac clock rate (%d)\n", err); | 225 | "failed to change mac clock rate (%d)\n", err); |
| 226 | goto out_clk_disable_macclk; | ||
| 227 | } | ||
| 226 | } | 228 | } |
| 227 | 229 | ||
| 228 | err = arc_emac_probe(ndev, interface); | 230 | err = arc_emac_probe(ndev, interface); |
| @@ -232,7 +234,8 @@ static int emac_rockchip_probe(struct platform_device *pdev) | |||
| 232 | } | 234 | } |
| 233 | 235 | ||
| 234 | return 0; | 236 | return 0; |
| 235 | 237 | out_clk_disable_macclk: | |
| 238 | clk_disable_unprepare(priv->macclk); | ||
| 236 | out_regulator_disable: | 239 | out_regulator_disable: |
| 237 | if (priv->regulator) | 240 | if (priv->regulator) |
| 238 | regulator_disable(priv->regulator); | 241 | regulator_disable(priv->regulator); |
