diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/net/tg3.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
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 8b3f84685387..4595962fb8e1 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; |