Re: [PATCH v3] net: ethernet: arc: fix error handling in emac_rockchip_probe

[David Miller]

From: Branislav Radocaj 
Date: Tue, 12 Dec 2017 00:13:38 +0100

> If clk_set_rate() fails, we should disable clk before return.
> Found by Linux Driver Verification project (linuxtesting.org).
> 
> Changes since v2 [1]:
> * Merged with latest code changes
> 
> Changes since v1:
> Update made thanks to David's review, much appreciated David.
> * Improved inconsistent failure handling of clock rate setting
> * For completeness of usecase, added arc_emac_probe error handling
> 
> Signed-off-by: Branislav Radocaj 

Applied.

[PATCH v3] net: ethernet: arc: fix error handling in emac_rockchip_probe

[Branislav Radocaj]

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

Changes since v2 [1]:
* Merged with latest code changes

Changes since v1:
Update made thanks to David's review, much appreciated David.
* Improved inconsistent failure handling of clock rate setting
* For completeness of usecase, added arc_emac_probe error handling

Signed-off-by: Branislav Radocaj 
---
[1] https://marc.info/?l=linux-netdev=151301239802445=2
---
 drivers/net/ethernet/arc/emac_rockchip.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/arc/emac_rockchip.c 
b/drivers/net/ethernet/arc/emac_rockchip.c
index c6163874e4e7..16f9bee992fe 100644
--- a/drivers/net/ethernet/arc/emac_rockchip.c
+++ b/drivers/net/ethernet/arc/emac_rockchip.c
@@ -199,9 +199,11 @@ static int emac_rockchip_probe(struct platform_device 
*pdev)
 
/* RMII interface needs always a rate of 50MHz */
err = clk_set_rate(priv->refclk, 5000);
-   if (err)
+   if (err) {
dev_err(dev,
"failed to change reference clock rate (%d)\n", err);
+   goto out_regulator_disable;
+   }
 
if (priv->soc_data->need_div_macclk) {
priv->macclk = devm_clk_get(dev, "macclk");
@@ -230,12 +232,14 @@ static int emac_rockchip_probe(struct platform_device 
*pdev)
err = arc_emac_probe(ndev, interface);
if (err) {
dev_err(dev, "failed to probe arc emac (%d)\n", err);
-   goto out_regulator_disable;
+   goto out_clk_disable_macclk;
}
 
return 0;
+
 out_clk_disable_macclk:
-   clk_disable_unprepare(priv->macclk);
+   if (priv->soc_data->need_div_macclk)
+   clk_disable_unprepare(priv->macclk);
 out_regulator_disable:
if (priv->regulator)
regulator_disable(priv->regulator);
-- 
2.11.0