diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/net/tg3.c | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 db606b60388..26ffb67f1da 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) return -EAGAIN; if (data == 0) - data = 2; + data = UINT_MAX / 2; for (i = 0; i < (data * 2); i++) { if ((i % 2) == 0) |