torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

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

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek 2009-08-18 04:19:00 +02:00 committed by John W. Linville
parent c3f967d301
commit 361c55cfad
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/mwl8k.c
View File

@ -2768,9 +2768,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
printk(KERN_ERR "%s() timed out\n", __func__); printk(KERN_ERR "%s() timed out\n", __func__);
/* Disable interrupts */ /* Disable interrupts */
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw); free_irq(priv->pdev->irq, hw);
/* Stop finalize join worker */ /* Stop finalize join worker */
@ -3457,9 +3455,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
} }
/* Disable interrupts */ /* Disable interrupts */
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw); free_irq(priv->pdev->irq, hw);
rc = ieee80211_register_hw(hw); rc = ieee80211_register_hw(hw);
@ -3483,9 +3479,7 @@ err_stop_firmware:
mwl8k_release_firmware(priv); mwl8k_release_firmware(priv);
err_free_irq: err_free_irq:
spin_lock_irq(&priv->tx_lock);
iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK); iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
spin_unlock_irq(&priv->tx_lock);
free_irq(priv->pdev->irq, hw); free_irq(priv->pdev->irq, hw);
err_free_queues: err_free_queues: