diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2011-04-21 09:03:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-25 14:50:16 -0400 |
commit | 788f6875fcf5d2bce221fbfd2318ac48df299031 (patch) | |
tree | 933972db0fd520038b5e49701d2f2571e138b3c4 /drivers/net/wireless/ath/ath9k/gpio.c | |
parent | ca45de77ad706e86b135b8564e21aa2c8a63f09b (diff) |
ath9k: Fix bug in configuring hw timer
Hw next tigger time is configured as current_tsf + (timer_period * 10) which
is wrong, it should be current_tsf + timer_period. The wrong hw timer configuration
would cause btcoex related issues.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index 44a0a886124d..cc5fad6a4019 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c | |||
@@ -138,10 +138,10 @@ static void ath_detect_bt_priority(struct ath_softc *sc) | |||
138 | 138 | ||
139 | static void ath9k_gen_timer_start(struct ath_hw *ah, | 139 | static void ath9k_gen_timer_start(struct ath_hw *ah, |
140 | struct ath_gen_timer *timer, | 140 | struct ath_gen_timer *timer, |
141 | u32 timer_next, | 141 | u32 trig_timeout, |
142 | u32 timer_period) | 142 | u32 timer_period) |
143 | { | 143 | { |
144 | ath9k_hw_gen_timer_start(ah, timer, timer_next, timer_period); | 144 | ath9k_hw_gen_timer_start(ah, timer, trig_timeout, timer_period); |
145 | 145 | ||
146 | if ((ah->imask & ATH9K_INT_GENTIMER) == 0) { | 146 | if ((ah->imask & ATH9K_INT_GENTIMER) == 0) { |
147 | ath9k_hw_disable_interrupts(ah); | 147 | ath9k_hw_disable_interrupts(ah); |
@@ -195,7 +195,7 @@ static void ath_btcoex_period_timer(unsigned long data) | |||
195 | 195 | ||
196 | timer_period = is_btscan ? btcoex->btscan_no_stomp : | 196 | timer_period = is_btscan ? btcoex->btscan_no_stomp : |
197 | btcoex->btcoex_no_stomp; | 197 | btcoex->btcoex_no_stomp; |
198 | ath9k_gen_timer_start(ah, btcoex->no_stomp_timer, 0, | 198 | ath9k_gen_timer_start(ah, btcoex->no_stomp_timer, timer_period, |
199 | timer_period * 10); | 199 | timer_period * 10); |
200 | btcoex->hw_timer_enabled = true; | 200 | btcoex->hw_timer_enabled = true; |
201 | } | 201 | } |