diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/net/sun3lance.c | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.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 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; |