Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / wireless / wl3501_cs.c

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 82d94f8..932f3f8 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1258,7 +1258,9 @@ static int wl3501_reset(struct net_device *dev)
 {
        struct wl3501_card *this = netdev_priv(dev);
        int rc = -ENODEV;
+       unsigned long flags;
 
+       spin_lock_irqsave(&this->lock, flags);
        wl3501_block_interrupt(this);
 
        if (wl3501_init_firmware(this)) {
@@ -1280,20 +1282,17 @@ static int wl3501_reset(struct net_device *dev)
        pr_debug("%s: device reset", dev->name);
        rc = 0;
 out:
+       spin_unlock_irqrestore(&this->lock, flags);
        return rc;
 }
 
 static void wl3501_tx_timeout(struct net_device *dev)
 {
-       struct wl3501_card *this = netdev_priv(dev);
        struct net_device_stats *stats = &dev->stats;
-       unsigned long flags;
        int rc;
 
        stats->tx_errors++;
-       spin_lock_irqsave(&this->lock, flags);
        rc = wl3501_reset(dev);
-       spin_unlock_irqrestore(&this->lock, flags);
        if (rc)
                printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n",
                       dev->name, rc);