diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 17:20:11 +0100 |
| commit | 0b6de0092244c98b5ba1abda34c92470a20e0d0c (patch) | |
| tree | 478e4e18c33fd9fa517559e1ce951fe378d5965f /drivers/net/sun3lance.c | |
| parent | 37a25424252b6cff4dd4b1937ab6a1dbfcadabcc (diff) | |
| parent | f62bae5009c1ba596cd475cafbc83e0570a36e26 (diff) | |
Merge branch 'x86/apic' into perfcounters/core
Conflicts:
arch/x86/kernel/cpu/perfctr-watchdog.c
Diffstat (limited to 'drivers/net/sun3lance.c')
| -rw-r--r-- | drivers/net/sun3lance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 4bb8f72c65c..e5beb299cbd 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c @@ -428,7 +428,7 @@ static int lance_open( struct net_device *dev ) while (--i > 0) if (DREG & CSR0_IDON) break; - if (i < 0 || (DREG & CSR0_ERR)) { + if (i <= 0 || (DREG & CSR0_ERR)) { DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n", dev->name, i, DREG )); DREG = CSR0_STOP; |