2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 05aeb511c686..77db932c3137 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1227,7 +1227,7 @@ void ath9k_hw_deinit(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
 
-        if (common->state <= ATH_HW_INITIALIZED)
+        if (common->state < ATH_HW_INITIALIZED)
                 goto free_hw;
 
         if (!AR_SREV_9100(ah))
@@ -1238,8 +1238,6 @@ void ath9k_hw_deinit(struct ath_hw *ah)
 free_hw:
         if (!AR_SREV_9280_10_OR_LATER(ah))
                 ath9k_hw_rf_free_ext_banks(ah);
-        kfree(ah);
-        ah = NULL;
 }
 EXPORT_SYMBOL(ath9k_hw_deinit);
 
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 623c2f884987..6063f5463708 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -758,6 +758,9 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 
         tasklet_kill(&sc->intr_tq);
         tasklet_kill(&sc->bcon_tasklet);
+
+        kfree(sc->sc_ah);
+        sc->sc_ah = NULL;
 }
 
 void ath9k_deinit_device(struct ath_softc *sc)