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/sun3lance.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
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 4bb8f72c65cc..e5beb299cbd0 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
| @@ -428,7 +428,7 @@ static int lance_open( struct net_device *dev ) | |||
| 428 | while (--i > 0) | 428 | while (--i > 0) |
| 429 | if (DREG & CSR0_IDON) | 429 | if (DREG & CSR0_IDON) |
| 430 | break; | 430 | break; |
| 431 | if (i < 0 || (DREG & CSR0_ERR)) { | 431 | if (i <= 0 || (DREG & CSR0_ERR)) { |
| 432 | DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n", | 432 | DPRINTK( 2, ( "lance_open(): opening %s failed, i=%d, csr0=%04x\n", |
| 433 | dev->name, i, DREG )); | 433 | dev->name, i, DREG )); |
| 434 | DREG = CSR0_STOP; | 434 | DREG = CSR0_STOP; |