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

Commit c88c3326 authored by Anirudh Rayabharam's avatar Anirudh Rayabharam Committed by Greg Kroah-Hartman
Browse files

net: stmicro: handle clk_prepare() failure during init 



commit 0c32a96d000f260b5ebfabb4145a86ae1cd71847 upstream.

In case clk_prepare() fails, capture and propagate the error code up the
stack. If regulator_enable() was called earlier, properly unwind it by
calling regulator_disable().

Signed-off-by: default avatarAnirudh Rayabharam <mail@anirudhrb.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-22-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 378041c9

drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c

+5 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct sunxi_priv_data { 
static int sun7i_gmac_init(struct platform_device *pdev, void *priv)

{

	struct sunxi_priv_data *gmac = priv;

	int ret;

	int ret = 0;



	if (gmac->regulator) {

		ret = regulator_enable(gmac->regulator);
@@ -59,10 +59,12 @@ static int sun7i_gmac_init(struct platform_device *pdev, void *priv) 
		gmac->clk_enabled = 1;

	} else {

		clk_set_rate(gmac->tx_clk, SUN7I_GMAC_MII_RATE);

		clk_prepare(gmac->tx_clk);

		ret = clk_prepare(gmac->tx_clk);

		if (ret && gmac->regulator)

			regulator_disable(gmac->regulator);

	}



	return 0;

	return ret;

}



static void sun7i_gmac_exit(struct platform_device *pdev, void *priv)