From 57445428488a2862840c4d7c96d7746c11031aaf Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 8 Aug 2000 19:25:53 +0000 Subject: Merge with Linu 2.4.0-test6-pre6. --- drivers/net/82596.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/net/82596.c') 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); -- cgit v1.2.3