浏览代码

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

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: Pavel Roskin <proski@gnu.org>
Acked-by: Nick Kossifidis <mickflemm@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Pavel Roskin 17 年之前
父节点
当前提交
256b152b00
共有 1 个文件被更改,包括 0 次插入5 次删除
  1. 0 5
      drivers/net/wireless/ath5k/base.c

+ 0 - 5
drivers/net/wireless/ath5k/base.c

@@ -473,9 +473,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) {
@@ -553,7 +550,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);
@@ -575,7 +571,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);