diff options
author | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
commit | eaf2a47f40f01ef793d2fc50cf03d199846013ca (patch) | |
tree | 0646365688ca76306aaa17ce7983944f5ec411b0 /drivers/net/ethernet/stmicro | |
parent | c829f5f52db9bae0379b98fca2645f6ca9b0fb1e (diff) | |
parent | 62967898789dc1f09a06e59fa85ae2c5ca4dc2da (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |