| Message ID | 1548532137-15618-1-git-send-email-khoroshilov@ispras.ru (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | c69c29a1a0a8f68cd87e98ba4a5a79fb8ef2a58c |
| Headers | show |
| Series | net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() | expand |
From: Alexey Khoroshilov <khoroshilov@ispras.ru> Date: Sat, 26 Jan 2019 22:48:57 +0300 > If phy_power_on() fails in rk_gmac_powerup(), clocks are left enabled. > > Found by Linux Driver Verification project (linuxtesting.org). > > Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Applied, thank you.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 7b923362ee55..3b174eae77c1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1342,8 +1342,10 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) } ret = phy_power_on(bsp_priv, true); - if (ret) + if (ret) { + gmac_clk_enable(bsp_priv, false); return ret; + } pm_runtime_enable(dev); pm_runtime_get_sync(dev);
If phy_power_on() fails in rk_gmac_powerup(), clocks are left enabled. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)