]> git.neil.brown.name Git - history.git/commitdiff
[NET]: Trivial fix for 82596 driver.
authorAngelo Dell\'Aera <buffer@antifork.org>
Mon, 4 Aug 2003 10:34:16 +0000 (03:34 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 4 Aug 2003 10:34:16 +0000 (03:34 -0700)
drivers/net/82596.c

index 30e52920c91e074ede99e4e289da75a5d2f1526c..1c60287f2036b1df7814bcb50d57b58b103e24c0 100644 (file)
@@ -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);