Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74875198 authored by Branislav Radocaj's avatar Branislav Radocaj Committed by Greg Kroah-Hartman
Browse files

net: ethernet: arc: fix error handling in emac_rockchip_probe 




[ Upstream commit e46772a6 ]

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

Signed-off-by: default avatarBranislav Radocaj <branislav@radocaj.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0476430

drivers/net/ethernet/arc/emac_rockchip.c

+5 −2
Original line number Diff line number Diff line
@@ -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);