Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 736b3a27 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

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: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 05020d23

drivers/net/wireless/ath/ath9k/hw.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/ath9k/init.c

+3 −0
Original line number Diff line number Diff line
@@ -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)