]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: ethernet: arc: fix error handling in emac_rockchip_probe
authorBranislav Radocaj <branislav@radocaj.org>
Wed, 6 Dec 2017 23:07:38 +0000 (00:07 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Dec 2017 18:51:09 +0000 (13:51 -0500)
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>
drivers/net/ethernet/arc/emac_rockchip.c

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