tg3 / broadcom: Refine AC131 APD support

[net-next-2.6.git] / drivers / net / phy / broadcom.c

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 5d2a2e90aba88856f4457e67c57eaa8cabf0d27e..bddf4a42ae6826447717cba846d4616b1bb6d3a1 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -561,9 +561,11 @@ static int brcm_fet_config_init(struct phy_device *phydev)
        if (err < 0)
                goto done;
 
-       /* Enable auto power down */
-       err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
-                                      MII_BRCM_FET_SHDW_AS2_APDE);
+       if (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE) {
+               /* Enable auto power down */
+               err = brcm_phy_setbits(phydev, MII_BRCM_FET_SHDW_AUXSTAT2,
+                                              MII_BRCM_FET_SHDW_AS2_APDE);
+       }
 
 done:
        /* Disable shadow register access */