diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /drivers/net/tg3.c | |
| parent | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/tg3.c')
| -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 5b3d60568d55..479a37f75f30 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; |