Patchwork tg3: fix typo && -> || in drivers/net/tg3.c

login
register
mail settings
Submitter Wei Yongjun
Date Feb. 17, 2009, 6:19 a.m.
Message ID <499A56EC.2020106@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/23241/
State Superseded
Delegated to: David Miller
Headers show

Comments

Wei Yongjun - Feb. 17, 2009, 6:19 a.m.
Fix the typo && -> ||

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
---
 drivers/net/tg3.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
David Miller - Feb. 19, 2009, 1:44 a.m.
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 17 Feb 2009 14:19:24 +0800

> Fix the typo && -> ||
> 
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>

Roel Kluin already posted a fix for this, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 4595962..b080f94 100644
--- a/drivers/net/tg3.c
+++ b/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;
 			}