Commit 49df2b33 authored by Jes Sorensen's avatar Jes Sorensen Committed by David S. Miller

iwlwifi: disable interrupts before calling request_irq

Disable interrupts in the iwl4965 before calling request_irq() for
the case that the previous OS or the BIOS left a pending interrupt in
the chip. This behavior has been observed on some laptops such as T61
Thinkpads and Toshiba Portege R500
Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eb76bf29
...@@ -8494,6 +8494,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -8494,6 +8494,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
priv->power_mode = IWL_POWER_AC; priv->power_mode = IWL_POWER_AC;
priv->user_txpower_limit = IWL_DEFAULT_TX_POWER; priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
iwl_disable_interrupts(priv);
pci_enable_msi(pdev); pci_enable_msi(pdev);
err = request_irq(pdev->irq, iwl_isr, IRQF_SHARED, DRV_NAME, priv); err = request_irq(pdev->irq, iwl_isr, IRQF_SHARED, DRV_NAME, priv);
......
...@@ -9122,6 +9122,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -9122,6 +9122,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
priv->power_mode = IWL_POWER_AC; priv->power_mode = IWL_POWER_AC;
priv->user_txpower_limit = IWL_DEFAULT_TX_POWER; priv->user_txpower_limit = IWL_DEFAULT_TX_POWER;
iwl_disable_interrupts(priv);
pci_enable_msi(pdev); pci_enable_msi(pdev);
err = request_irq(pdev->irq, iwl_isr, IRQF_SHARED, DRV_NAME, priv); err = request_irq(pdev->irq, iwl_isr, IRQF_SHARED, DRV_NAME, priv);
......
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