| From 07daa63929e041220bd2afea3d8216cca161d7e2 Mon Sep 17 00:00:00 2001 |
| From: Alexey Khoroshilov <khoroshilov@ispras.ru> |
| Date: Sat, 26 Jan 2019 22:48:57 +0300 |
| Subject: net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() |
| |
| [ Upstream commit c69c29a1a0a8f68cd87e98ba4a5a79fb8ef2a58c ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| 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); |
| -- |
| 2.19.1 |
| |
