aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSenthil Balasubramanian <senthilkumar@atheros.com>2008-11-13 07:30:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:41:30 -0500
commit306efdd109f086b19d849f1ec0f9104c9fdb3444 (patch)
tree2a7ef0b28a9b021fa3e3f2f9d3b2f6ac02f093bb /drivers
parente97275cb062cf927cdb086f0107657dd92160801 (diff)
ath9k: IRQ should be disabled before calling free_irq()
ath9k frees irq even before IRQs are disabled and existing IRQs are flushed when rfkill_register() fails. Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath9k/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index ce94edee71d1..1ebf60627f77 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -810,9 +810,9 @@ static int ath_start_rfkill_poll(struct ath_softc *sc)
810 rfkill_free(sc->rf_kill.rfkill); 810 rfkill_free(sc->rf_kill.rfkill);
811 811
812 /* Deinitialize the device */ 812 /* Deinitialize the device */
813 ath_detach(sc);
813 if (sc->pdev->irq) 814 if (sc->pdev->irq)
814 free_irq(sc->pdev->irq, sc); 815 free_irq(sc->pdev->irq, sc);
815 ath_detach(sc);
816 pci_iounmap(sc->pdev, sc->mem); 816 pci_iounmap(sc->pdev, sc->mem);
817 pci_release_region(sc->pdev, 0); 817 pci_release_region(sc->pdev, 0);
818 pci_disable_device(sc->pdev); 818 pci_disable_device(sc->pdev);