Skip to content

L
linux-davinci
Commit 361c55cf authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by John W. Linville
Browse files
Options

mwl8k: no need to hold ->tx_lock while setting the hardware interrupt mask 

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c3f967d3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
drivers/net/wireless/mwl8k.c
View file @ 361c55cf
......@@ -2768,9 +2768,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
printk(KERN_ERR "%s() timed out\n", __func__);
/* Disable interrupts */
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw);
/* Stop finalize join worker */
......@@ -3457,9 +3455,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
}
/* Disable interrupts */
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw);
rc = ieee80211_register_hw(hw);
......@@ -3483,9 +3479,7 @@ err_stop_firmware:
mwl8k_release_firmware(priv);
err_free_irq:
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw);
err_free_queues:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment