diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /drivers/net/ethernet/nxp/lpc_eth.c | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
Diffstat (limited to 'drivers/net/ethernet/nxp/lpc_eth.c')
| -rw-r--r-- | drivers/net/ethernet/nxp/lpc_eth.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 8706c0dbd0c3..a44a03c45014 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c | |||
| @@ -1220,6 +1220,9 @@ static int lpc_eth_open(struct net_device *ndev) | |||
| 1220 | 1220 | ||
| 1221 | __lpc_eth_clock_enable(pldat, true); | 1221 | __lpc_eth_clock_enable(pldat, true); |
| 1222 | 1222 | ||
| 1223 | /* Suspended PHY makes LPC ethernet core block, so resume now */ | ||
| 1224 | phy_resume(pldat->phy_dev); | ||
| 1225 | |||
| 1223 | /* Reset and initialize */ | 1226 | /* Reset and initialize */ |
| 1224 | __lpc_eth_reset(pldat); | 1227 | __lpc_eth_reset(pldat); |
| 1225 | __lpc_eth_init(pldat); | 1228 | __lpc_eth_init(pldat); |