diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/net/tg3.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index db606b603884..26ffb67f1da2 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -8781,7 +8781,7 @@ static int tg3_phys_id(struct net_device *dev, u32 data) | |||
| 8781 | return -EAGAIN; | 8781 | return -EAGAIN; |
| 8782 | 8782 | ||
| 8783 | if (data == 0) | 8783 | if (data == 0) |
| 8784 | data = 2; | 8784 | data = UINT_MAX / 2; |
| 8785 | 8785 | ||
| 8786 | for (i = 0; i < (data * 2); i++) { | 8786 | for (i = 0; i < (data * 2); i++) { |
| 8787 | if ((i % 2) == 0) | 8787 | if ((i % 2) == 0) |