From: Senthil Balasubramanian <senthilkumar@atheros.com>
Date: Thu, 13 Nov 2008 12:30:37 +0000 (+0530)
Subject: ath9k: IRQ should be disabled before calling free_irq()
X-Git-Tag: v2.6.29-rc1~581^2~383^2~63
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=306efdd109f086b19d849f1ec0f9104c9fdb3444;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index ce94edee..1ebf606 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)
 			rfkill_free(sc->rf_kill.rfkill);
 
 			/* Deinitialize the device */
+			ath_detach(sc);
 			if (sc->pdev->irq)
 				free_irq(sc->pdev->irq, sc);
-			ath_detach(sc);
 			pci_iounmap(sc->pdev, sc->mem);
 			pci_release_region(sc->pdev, 0);
 			pci_disable_device(sc->pdev);