diff options
| author | Kalle Valo <kvalo@kernel.org> | 2022-06-15 15:57:20 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-06-15 15:57:20 +0300 |
| commit | 8092a0eed4080a33a4c8681f4231c40c0bb7cb5c (patch) | |
| tree | ad720d82d1b224b908b908585ed4ec469d54d038 /drivers/net/wireless/ath/ath5k/phy.c | |
| parent | fbb89d02e33a8c8f522d75882f5f19c65b722b46 (diff) | |
| parent | cc2609eda6981d65b3b1c81e2807910d718b2b98 (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v5.20. Major changes:
ath10k
* 802.3 frame format support
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/phy.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 00f9e347d414..5797ef9c73d7 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -3136,7 +3136,7 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *ah, pdadc_n = gain_boundaries[pdg] + pd_gain_overlap - pwr_min[pdg]; /* Limit it to be inside pwr range */ table_size = pwr_max[pdg] - pwr_min[pdg]; - max_idx = (pdadc_n < table_size) ? pdadc_n : table_size; + max_idx = min(pdadc_n, table_size); /* Fill pdadc_out table */ while (pdadc_0 < max_idx && pdadc_i < 128) |