diff options
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index a2fda702b620..d82a0f97e6f5 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c | |||
@@ -2516,10 +2516,8 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, | |||
2516 | targetPowerCck.tPow2x[1]; | 2516 | targetPowerCck.tPow2x[1]; |
2517 | ratesArray[rate5_5s] = ratesArray[rate5_5l] = | 2517 | ratesArray[rate5_5s] = ratesArray[rate5_5l] = |
2518 | targetPowerCck.tPow2x[2]; | 2518 | targetPowerCck.tPow2x[2]; |
2519 | ; | ||
2520 | ratesArray[rate11s] = ratesArray[rate11l] = | 2519 | ratesArray[rate11s] = ratesArray[rate11l] = |
2521 | targetPowerCck.tPow2x[3]; | 2520 | targetPowerCck.tPow2x[3]; |
2522 | ; | ||
2523 | } | 2521 | } |
2524 | if (IS_CHAN_HT40(chan)) { | 2522 | if (IS_CHAN_HT40(chan)) { |
2525 | for (i = 0; i < ARRAY_SIZE(targetPowerHt40.tPow2x); i++) { | 2523 | for (i = 0; i < ARRAY_SIZE(targetPowerHt40.tPow2x); i++) { |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 34935a8ee59d..cffb0789f669 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -2345,7 +2345,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, | |||
2345 | ath9k_hw_init_bb(ah, chan); | 2345 | ath9k_hw_init_bb(ah, chan); |
2346 | 2346 | ||
2347 | if (!ath9k_hw_init_cal(ah, chan)) | 2347 | if (!ath9k_hw_init_cal(ah, chan)) |
2348 | return -EIO;; | 2348 | return -EIO; |
2349 | 2349 | ||
2350 | rx_chainmask = ah->rxchainmask; | 2350 | rx_chainmask = ah->rxchainmask; |
2351 | if ((rx_chainmask == 0x5) || (rx_chainmask == 0x3)) { | 2351 | if ((rx_chainmask == 0x5) || (rx_chainmask == 0x3)) { |