Commit 293f49dd authored by Pavel Roskin's avatar Pavel Roskin Committed by Greg Kroah-Hartman

ath5k: don't enable MSI, we cannot handle it yet

commit 256b152b upstream

MSI is a nice thing, but we cannot enable it without changing the
interrupt handler.  If we do it, we break MSI capable hardware,
specifically AR5006 chipset.
Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 00b289bb
...@@ -487,9 +487,6 @@ ath5k_pci_probe(struct pci_dev *pdev, ...@@ -487,9 +487,6 @@ ath5k_pci_probe(struct pci_dev *pdev,
/* Set private data */ /* Set private data */
pci_set_drvdata(pdev, hw); pci_set_drvdata(pdev, hw);
/* Enable msi for devices that support it */
pci_enable_msi(pdev);
/* Setup interrupt handler */ /* Setup interrupt handler */
ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
if (ret) { if (ret) {
...@@ -567,7 +564,6 @@ err_ah: ...@@ -567,7 +564,6 @@ err_ah:
err_irq: err_irq:
free_irq(pdev->irq, sc); free_irq(pdev->irq, sc);
err_free: err_free:
pci_disable_msi(pdev);
ieee80211_free_hw(hw); ieee80211_free_hw(hw);
err_map: err_map:
pci_iounmap(pdev, mem); pci_iounmap(pdev, mem);
...@@ -589,7 +585,6 @@ ath5k_pci_remove(struct pci_dev *pdev) ...@@ -589,7 +585,6 @@ ath5k_pci_remove(struct pci_dev *pdev)
ath5k_detach(pdev, hw); ath5k_detach(pdev, hw);
ath5k_hw_detach(sc->ah); ath5k_hw_detach(sc->ah);
free_irq(pdev->irq, sc); free_irq(pdev->irq, sc);
pci_disable_msi(pdev);
pci_iounmap(pdev, sc->iobase); pci_iounmap(pdev, sc->iobase);
pci_release_region(pdev, 0); pci_release_region(pdev, 0);
pci_disable_device(pdev); pci_disable_device(pdev);
......
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