openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: Fix build error in ath_reset_internal 

drivers/net/wireless/ath/ath9k/main.c:299 ath_reset_internal()
error: we previously assumed 'hchan' could be null (see line 293)

Cc: Felix Fietkau <nbd@openwrt.org>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rajkumar Manoharan 2014-06-20 22:47:49 +05:30 committed by John W. Linville
parent 418378fed0
commit d6067f0e17
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ath9k/main.c
View File

@ -314,11 +314,9 @@ int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)
if (!ath_prepare_reset(sc)) if (!ath_prepare_reset(sc))
fastcc = false; fastcc = false;
if (hchan) { spin_lock_bh(&sc->chan_lock);
spin_lock_bh(&sc->chan_lock); sc->cur_chandef = sc->cur_chan->chandef;
sc->cur_chandef = sc->cur_chan->chandef; spin_unlock_bh(&sc->chan_lock);
spin_unlock_bh(&sc->chan_lock);
}
ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n", ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
hchan->channel, IS_CHAN_HT40(hchan), fastcc); hchan->channel, IS_CHAN_HT40(hchan), fastcc);