diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /drivers/net/wireless/ath/ath9k/btcoex.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/btcoex.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/btcoex.c | 8 | 
1 files changed, 5 insertions, 3 deletions
| diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c index 41ce0b139886..6635c377dc00 100644 --- a/drivers/net/wireless/ath/ath9k/btcoex.c +++ b/drivers/net/wireless/ath/ath9k/btcoex.c @@ -50,7 +50,7 @@ void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)  		.bt_first_slot_time = 5,  		.bt_hold_rx_clear = true,  	}; -	u32 i; +	u32 i, idx;  	bool rxclear_polarity = ath_bt_config.bt_rxclear_polarity;  	if (AR_SREV_9300_20_OR_LATER(ah)) @@ -73,8 +73,10 @@ void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum)  		SM(ATH_BTCOEX_BMISS_THRESH, AR_BT_BCN_MISS_THRESH) |  		AR_BT_DISABLE_BT_ANT; -	for (i = 0; i < 32; i++) -		ah->hw_gen_timers.gen_timer_index[(debruijn32 << i) >> 27] = i; +	for (i = 0; i < 32; i++) { +		idx = (debruijn32 << i) >> 27; +		ah->hw_gen_timers.gen_timer_index[idx] = i; +	}  }  EXPORT_SYMBOL(ath9k_hw_init_btcoex_hw); | 
