aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-08-17 22:19:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:38:07 -0400
commit361c55cfaddaa36f0997c5a96948ba5888bfb992 (patch)
treeb380ea8e84e7dad2666a4ecb7229408dbff8b6a9
parentc3f967d301a76b7053d16817c34191964c457566 (diff)
mwl8k: no need to hold ->tx_lock while setting the hardware interrupt mask
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwl8k.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 0281e70cec84..177d92f0b877 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -2768,9 +2768,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
2768 printk(KERN_ERR "%s() timed out\n", __func__); 2768 printk(KERN_ERR "%s() timed out\n", __func__);
2769 2769
2770 /* Disable interrupts */ 2770 /* Disable interrupts */
2771 spin_lock_irq(&priv->tx_lock);
2772 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); 2771 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
2773 spin_unlock_irq(&priv->tx_lock);
2774 free_irq(priv->pdev->irq, hw); 2772 free_irq(priv->pdev->irq, hw);
2775 2773
2776 /* Stop finalize join worker */ 2774 /* Stop finalize join worker */
@@ -3457,9 +3455,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3457 } 3455 }
3458 3456
3459 /* Disable interrupts */ 3457 /* Disable interrupts */
3460 spin_lock_irq(&priv->tx_lock);
3461 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); 3458 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
3462 spin_unlock_irq(&priv->tx_lock);
3463 free_irq(priv->pdev->irq, hw); 3459 free_irq(priv->pdev->irq, hw);
3464 3460
3465 rc = ieee80211_register_hw(hw); 3461 rc = ieee80211_register_hw(hw);
@@ -3483,9 +3479,7 @@ err_stop_firmware:
3483 mwl8k_release_firmware(priv); 3479 mwl8k_release_firmware(priv);
3484 3480
3485err_free_irq: 3481err_free_irq:
3486 spin_lock_irq(&priv->tx_lock);
3487 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); 3482 iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
3488 spin_unlock_irq(&priv->tx_lock);
3489 free_irq(priv->pdev->irq, hw); 3483 free_irq(priv->pdev->irq, hw);
3490 3484
3491err_free_queues: 3485err_free_queues: