1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 4595962fb8e1..dabdf59f8016 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1473,7 +1473,8 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable)
 {
         u32 reg;
 
-        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
+        if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
                 return;
 
         reg = MII_TG3_MISC_SHDW_WREN |
@@ -2237,8 +2238,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                         phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask;
                         if (phyid != TG3_PHY_ID_BCMAC131) {
                                 phyid &= TG3_PHY_OUI_MASK;
-                                if (phyid == TG3_PHY_OUI_1 &&
-                                    phyid == TG3_PHY_OUI_2 &&
+                                if (phyid == TG3_PHY_OUI_1 ||
+                                    phyid == TG3_PHY_OUI_2 ||
                                     phyid == TG3_PHY_OUI_3)
                                         do_low_power = true;
                         }