net: wireless: ath9k: avoid possible NULL pointer dereference

[deliverable/linux.git] / drivers / net / wireless / ath / ath9k / hw.c

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index dcdbab48709ec7f5c9081caaedf967df65fdb1e5..8918035da3a3510c04ad45e106cebd3d267ad6e8 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -146,10 +146,9 @@ static void ath9k_hw_set_clockrate(struct ath_hw *ah)
        else
                clockrate = ATH9K_CLOCK_RATE_5GHZ_OFDM;
 
-       if (IS_CHAN_HT40(chan))
-               clockrate *= 2;
-
-       if (ah->curchan) {
+       if (chan) {
+               if (IS_CHAN_HT40(chan))
+                       clockrate *= 2;
                if (IS_CHAN_HALF_RATE(chan))
                        clockrate /= 2;
                if (IS_CHAN_QUARTER_RATE(chan))
@@ -1885,7 +1884,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
        } else if (caldata) {
                clear_bit(PAPRD_PACKET_SENT, &caldata->cal_flags);
        }
-       ah->noise = ath9k_hw_getchan_noise(ah, chan);
+       ah->noise = ath9k_hw_getchan_noise(ah, chan, chan->noisefloor);
 
        if (fastcc) {
                r = ath9k_hw_do_fastcc(ah, chan);