diff options
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 10 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 0ca7635d0669..ff8150e46f0e 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
| @@ -4645,10 +4645,16 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah, | |||
| 4645 | case 1: | 4645 | case 1: |
| 4646 | break; | 4646 | break; |
| 4647 | case 2: | 4647 | case 2: |
| 4648 | scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; | 4648 | if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN) |
| 4649 | scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; | ||
| 4650 | else | ||
| 4651 | scaledPower = 0; | ||
| 4649 | break; | 4652 | break; |
| 4650 | case 3: | 4653 | case 3: |
| 4651 | scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; | 4654 | if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN) |
| 4655 | scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; | ||
| 4656 | else | ||
| 4657 | scaledPower = 0; | ||
| 4652 | break; | 4658 | break; |
| 4653 | } | 4659 | } |
| 4654 | 4660 | ||
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index 7856f0d4512d..343fc9f946db 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c | |||
| @@ -524,10 +524,16 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, | |||
| 524 | case 1: | 524 | case 1: |
| 525 | break; | 525 | break; |
| 526 | case 2: | 526 | case 2: |
| 527 | scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; | 527 | if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN) |
| 528 | scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN; | ||
| 529 | else | ||
| 530 | scaledPower = 0; | ||
| 528 | break; | 531 | break; |
| 529 | case 3: | 532 | case 3: |
| 530 | scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; | 533 | if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN) |
| 534 | scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN; | ||
| 535 | else | ||
| 536 | scaledPower = 0; | ||
| 531 | break; | 537 | break; |
| 532 | } | 538 | } |
| 533 | scaledPower = max((u16)0, scaledPower); | 539 | scaledPower = max((u16)0, scaledPower); |