diff options
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index affb29da353e..1e1f6194cb37 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
| @@ -1356,12 +1356,8 @@ static int smsc911x_phy_disable_energy_detect(struct smsc911x_data *pdata) | |||
| 1356 | return rc; | 1356 | return rc; |
| 1357 | } | 1357 | } |
| 1358 | 1358 | ||
| 1359 | /* | 1359 | /* Only disable if energy detect mode is already enabled */ |
| 1360 | * If energy is detected the PHY is already awake so is not necessary | 1360 | if (rc & MII_LAN83C185_EDPWRDOWN) { |
| 1361 | * to disable the energy detect power-down mode. | ||
| 1362 | */ | ||
| 1363 | if ((rc & MII_LAN83C185_EDPWRDOWN) && | ||
| 1364 | !(rc & MII_LAN83C185_ENERGYON)) { | ||
| 1365 | /* Disable energy detect mode for this SMSC Transceivers */ | 1361 | /* Disable energy detect mode for this SMSC Transceivers */ |
| 1366 | rc = phy_write(pdata->phy_dev, MII_LAN83C185_CTRL_STATUS, | 1362 | rc = phy_write(pdata->phy_dev, MII_LAN83C185_CTRL_STATUS, |
| 1367 | rc & (~MII_LAN83C185_EDPWRDOWN)); | 1363 | rc & (~MII_LAN83C185_EDPWRDOWN)); |
