diff options
| author | Colin Cross <ccross@android.com> | 2011-08-08 17:16:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-08 17:16:17 -0700 |
| commit | 468c64fd402ad29dcc8ffbe5b9efb8acf36c7e55 (patch) | |
| tree | 03a80f7a55d53243c3a4e125e51290e76bb9e48a /drivers/net/wireless/ath/ath9k/eeprom_9287.c | |
| parent | 9c0f85dc32867c3d0615bcf626321584db801b2f (diff) | |
| parent | ea0dc0dc1c1dca25e50384e300a528db57ee7de5 (diff) | |
Merge commit 'v2.6.39.4' into linux-tegra-2.6.39
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom_9287.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index 8cd8333cc086..945e4488beec 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c @@ -522,10 +522,16 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, case 1: break; case 2: - scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; + if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN) + scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; + else + scaledPower = 0; break; case 3: - scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; + if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN) + scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; + else + scaledPower = 0; break; } scaledPower = max((u16)0, scaledPower); |