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

Commit 159cd468 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Make sure we have current channel in ah_curchan before rf disable/enable 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 82880a7c

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

+6 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,9 @@ void ath_radio_enable(struct ath_softc *sc) 
	ath9k_ps_wakeup(sc);

	ath9k_hw_configpcipowersave(ah, 0);



	if (!ah->curchan)

		ah->curchan = ath_get_curchannel(sc, sc->hw);



	spin_lock_bh(&sc->sc_resetlock);

	r = ath9k_hw_reset(ah, ah->curchan, false);

	if (r) {
@@ -1175,6 +1178,9 @@ void ath_radio_disable(struct ath_softc *sc) 
	ath_stoprecv(sc);		/* turn off frame recv */

	ath_flushrecv(sc);		/* flush recv queue */



	if (!ah->curchan)

		ah->curchan = ath_get_curchannel(sc, sc->hw);



	spin_lock_bh(&sc->sc_resetlock);

	r = ath9k_hw_reset(ah, ah->curchan, false);

	if (r) {