diff options
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 8b3f84685387..b080f9493d83 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -852,7 +852,7 @@ static int tg3_bmcr_reset(struct tg3 *tp) | |||
| 852 | } | 852 | } |
| 853 | udelay(10); | 853 | udelay(10); |
| 854 | } | 854 | } |
| 855 | if (limit <= 0) | 855 | if (limit < 0) |
| 856 | return -EBUSY; | 856 | return -EBUSY; |
| 857 | 857 | ||
| 858 | return 0; | 858 | return 0; |
| @@ -1603,7 +1603,7 @@ static int tg3_wait_macro_done(struct tg3 *tp) | |||
| 1603 | break; | 1603 | break; |
| 1604 | } | 1604 | } |
| 1605 | } | 1605 | } |
| 1606 | if (limit <= 0) | 1606 | if (limit < 0) |
| 1607 | return -EBUSY; | 1607 | return -EBUSY; |
| 1608 | 1608 | ||
| 1609 | return 0; | 1609 | return 0; |
| @@ -2237,8 +2237,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) | |||
| 2237 | phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask; | 2237 | phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask; |
| 2238 | if (phyid != TG3_PHY_ID_BCMAC131) { | 2238 | if (phyid != TG3_PHY_ID_BCMAC131) { |
| 2239 | phyid &= TG3_PHY_OUI_MASK; | 2239 | phyid &= TG3_PHY_OUI_MASK; |
| 2240 | if (phyid == TG3_PHY_OUI_1 && | 2240 | if (phyid == TG3_PHY_OUI_1 || |
| 2241 | phyid == TG3_PHY_OUI_2 && | 2241 | phyid == TG3_PHY_OUI_2 || |
| 2242 | phyid == TG3_PHY_OUI_3) | 2242 | phyid == TG3_PHY_OUI_3) |
| 2243 | do_low_power = true; | 2243 | do_low_power = true; |
| 2244 | } | 2244 | } |