diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-02-18 17:42:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-18 17:42:42 -0800 |
| commit | f72b534961ac38dde17824d7693292eeaadf10e8 (patch) | |
| tree | 6ad2b67b3c09ebb4079d9facbf66fe23592a554e /drivers/net | |
| parent | 858671f80ae5db68d6bcd2c6d3a13e366040ba9b (diff) | |
| download | op-kernel-dev-f72b534961ac38dde17824d7693292eeaadf10e8.zip op-kernel-dev-f72b534961ac38dde17824d7693292eeaadf10e8.tar.gz | |
TG3: &&/|| confusion
phyid Can't be both TG3_PHY_OUI_1 and TG3_PHY_OUI_2 and TG3_PHY_OUI_3.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |
