Update lasi_82596 net driver to replace cli/sti with spinlock

8dad8cdf · Matthew Wilcox · Jeff Garzik · 1a969c21 · 8dad8cdf
Commit 8dad8cdf authored Oct 25, 2002 by Matthew Wilcox Committed by Jeff Garzik Oct 25, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

drivers/net/lasi_82596.c drivers/net/lasi_82596.c +2 -3

No files found.
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -1412,8 +1412,7 @@ static int i596_close(struct net_device *dev)
 	DEB(DEB_INIT,printk("%s: Shutting down ethercard, status was %4.4x.\n",
 		       dev->name, lp->scb.status));
-	save_flags(flags);
+	spin_lock_irqsave(&lp->lock, flags);
-	cli();
 	wait_cmd(dev,lp,100,"close1 timed out");
 	lp->scb.command = CUC_ABORT | RX_ABORT;
@@ -1422,7 +1421,7 @@ static int i596_close(struct net_device *dev)
 	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);