From: Angelo Dell\'Aera <buffer@antifork.org>
Date: Mon, 4 Aug 2003 10:34:16 +0000 (-0700)
Subject: [NET]: Trivial fix for 82596 driver.
X-Git-Tag: v2.6.0-test3~36^2~1^2~2
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=6c0e26367c58d7164d7f1c3d9815d812ca8a9486;p=history.git

[NET]: Trivial fix for 82596 driver.
---

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 30e52920c91e..1c60287f2036 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1420,15 +1420,15 @@ static int i596_close(struct net_device *dev)
 	DEB(DEB_INIT,printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.\n",
 		       dev->name, lp->scb.status));
 
-	save_flags(flags);
-	cli();
+	spin_lock_irqsave(&lp->lock, flags);
 
 	wait_cmd(dev,lp,100,"close1 timed out");
 	lp->scb.command = CUC_ABORT | RX_ABORT;
 	CA(dev);
 
 	wait_cmd(dev,lp,100,"close2 timed out");
-	restore_flags(flags);
+
+	spin_unlock_irqrestore(&lp->lock, flags);
 	DEB(DEB_STRUCT,i596_display_data(dev));
 	i596_cleanup_cmd(dev,lp);