提交 736b3a27 编写于 作者: S Sujith 提交者: John W. Linville

ath9k_hw: fix hardware deinit

Without this you will get a panic if the device initialization
fails. Also, free ath_hw instance properly. ath9k_hw_deinit()
shouldn't do it.

Cc: stable@kernel.org
Signed-off-by: NSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: NLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 05020d23
...@@ -1227,7 +1227,7 @@ void ath9k_hw_deinit(struct ath_hw *ah) ...@@ -1227,7 +1227,7 @@ void ath9k_hw_deinit(struct ath_hw *ah)
{ {
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
if (common->state <= ATH_HW_INITIALIZED) if (common->state < ATH_HW_INITIALIZED)
goto free_hw; goto free_hw;
if (!AR_SREV_9100(ah)) if (!AR_SREV_9100(ah))
...@@ -1238,8 +1238,6 @@ void ath9k_hw_deinit(struct ath_hw *ah) ...@@ -1238,8 +1238,6 @@ void ath9k_hw_deinit(struct ath_hw *ah)
free_hw: free_hw:
if (!AR_SREV_9280_10_OR_LATER(ah)) if (!AR_SREV_9280_10_OR_LATER(ah))
ath9k_hw_rf_free_ext_banks(ah); ath9k_hw_rf_free_ext_banks(ah);
kfree(ah);
ah = NULL;
} }
EXPORT_SYMBOL(ath9k_hw_deinit); EXPORT_SYMBOL(ath9k_hw_deinit);
......
...@@ -758,6 +758,9 @@ static void ath9k_deinit_softc(struct ath_softc *sc) ...@@ -758,6 +758,9 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
tasklet_kill(&sc->intr_tq); tasklet_kill(&sc->intr_tq);
tasklet_kill(&sc->bcon_tasklet); tasklet_kill(&sc->bcon_tasklet);
kfree(sc->sc_ah);
sc->sc_ah = NULL;
} }
void ath9k_deinit_device(struct ath_softc *sc) void ath9k_deinit_device(struct ath_softc *sc)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册