From eeecd48a2c591ef5da2ae950c2dc3ecdb934ff58 Mon Sep 17 00:00:00 2001
From: Senthil Balasubramanian <senthilkumar@atheros.com>
Date: Thu, 13 Nov 2008 18:00:37 +0530
Subject: [PATCH] --- yaml --- r: 122279 b: refs/heads/master c:
 306efdd109f086b19d849f1ec0f9104c9fdb3444 h: refs/heads/master i:   122277:
 85f61566059c29e5a181b0854a0ce386630fd259   122275:
 5ab030d9f2a58dc18ada46823bc7b9feccd84950   122271:
 3d9cb0dd38b532461fa05ac2d9897b096dec5493 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/ath9k/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97bbfb96949f..067a07714e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e97275cb062cf927cdb086f0107657dd92160801
+refs/heads/master: 306efdd109f086b19d849f1ec0f9104c9fdb3444
diff --git a/trunk/drivers/net/wireless/ath9k/main.c b/trunk/drivers/net/wireless/ath9k/main.c
index ce94edee71d1..1ebf60627f77 100644
--- a/trunk/drivers/net/wireless/ath9k/main.c
+++ b/trunk/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);