github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: stmicro: handle clk_prepare() failure during init

Browse Source 
commit 0c32a96d00 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: Anirudh 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Anirudh Rayabharam 2021-05-03 13:56:48 +02:00 committed by Greg Kroah-Hartman
parent c89c9a2911
commit 0eb496c3c1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
View File

@ -30,7 +30,7 @@ struct sunxi_priv_data {
static int sun7i_gmac_init(struct platform_device *pdev, void *priv) static int sun7i_gmac_init(struct platform_device *pdev, void *priv)
{ {
struct sunxi_priv_data *gmac = priv; struct sunxi_priv_data *gmac = priv;
int ret; int ret = 0;
if (gmac->regulator) { if (gmac->regulator) {
ret = regulator_enable(gmac->regulator); ret = regulator_enable(gmac->regulator);
@ -50,10 +50,12 @@ static int sun7i_gmac_init(struct platform_device *pdev, void *priv)
gmac->clk_enabled = 1; gmac->clk_enabled = 1;
} else { } else {
clk_set_rate(gmac->tx_clk, SUN7I_GMAC_MII_RATE); 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) static void sun7i_gmac_exit(struct platform_device *pdev, void *priv)