---

yaml --- r: 131692 b: refs/heads/master c: f72b534 h: refs/heads/master v: v3
git-mirror · Feb 19, 2009 · 3b3299f · 3b3299f
1 parent 69f66e3
commit 3b3299f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 858671f80ae5db68d6bcd2c6d3a13e366040ba9b
+refs/heads/master: f72b534961ac38dde17824d7693292eeaadf10e8
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -2237,8 +2237,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;
 			}