diff options
author | Pavel Roskin <proski@gnu.org> | 2008-07-18 12:56:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-29 16:55:04 -0400 |
commit | 256b152b005e319f985f50f2a910a75ba0def74f (patch) | |
tree | 38506dca247adf3ae1b79dc55661e9124db75728 | |
parent | bc05116ab33d30342e2b4b1bcc6d6e1184e9df97 (diff) |
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>
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 3285032727b3..1106d1c06298 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -473,9 +473,6 @@ ath5k_pci_probe(struct pci_dev *pdev, | |||
473 | /* Set private data */ | 473 | /* Set private data */ |
474 | pci_set_drvdata(pdev, hw); | 474 | pci_set_drvdata(pdev, hw); |
475 | 475 | ||
476 | /* Enable msi for devices that support it */ | ||
477 | pci_enable_msi(pdev); | ||
478 | |||
479 | /* Setup interrupt handler */ | 476 | /* Setup interrupt handler */ |
480 | ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); | 477 | ret = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); |
481 | if (ret) { | 478 | if (ret) { |
@@ -553,7 +550,6 @@ err_ah: | |||
553 | err_irq: | 550 | err_irq: |
554 | free_irq(pdev->irq, sc); | 551 | free_irq(pdev->irq, sc); |
555 | err_free: | 552 | err_free: |
556 | pci_disable_msi(pdev); | ||
557 | ieee80211_free_hw(hw); | 553 | ieee80211_free_hw(hw); |
558 | err_map: | 554 | err_map: |
559 | pci_iounmap(pdev, mem); | 555 | pci_iounmap(pdev, mem); |
@@ -575,7 +571,6 @@ ath5k_pci_remove(struct pci_dev *pdev) | |||
575 | ath5k_detach(pdev, hw); | 571 | ath5k_detach(pdev, hw); |
576 | ath5k_hw_detach(sc->ah); | 572 | ath5k_hw_detach(sc->ah); |
577 | free_irq(pdev->irq, sc); | 573 | free_irq(pdev->irq, sc); |
578 | pci_disable_msi(pdev); | ||
579 | pci_iounmap(pdev, sc->iobase); | 574 | pci_iounmap(pdev, sc->iobase); |
580 | pci_release_region(pdev, 0); | 575 | pci_release_region(pdev, 0); |
581 | pci_disable_device(pdev); | 576 | pci_disable_device(pdev); |