summaryrefslogtreecommitdiffstats
path: root/drivers/net/82596.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-08 19:25:53 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-08 19:25:53 +0000
commit57445428488a2862840c4d7c96d7746c11031aaf (patch)
tree60b88b3a21896a33ee4dccc727d88b745a9ff731 /drivers/net/82596.c
parent2e837819b1563679b55363d469239fdf4f17fbbb (diff)
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r--drivers/net/82596.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 7fa0bb8e1..6a458a39c 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -706,8 +706,10 @@ static int init_i596_mem(struct net_device *dev)
spin_lock_irqsave (&lp->lock, flags);
- if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START"))
+ if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START")) {
+ spin_unlock_irqrestore ((&lp->lock, flags);
goto failed;
+ }
DEB(DEB_INIT,printk("%s: Issuing RX_START\n", dev->name));
lp->scb.command = RX_START;
CA(dev);