diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/gpio.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index 4a9a68bba324..6a1a482f9dc3 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c | |||
@@ -259,7 +259,7 @@ static void ath9k_gen_timer_start(struct ath_hw *ah, | |||
259 | ath9k_hw_gen_timer_start(ah, timer, timer_next, timer_period); | 259 | ath9k_hw_gen_timer_start(ah, timer, timer_next, timer_period); |
260 | 260 | ||
261 | if ((ah->imask & ATH9K_INT_GENTIMER) == 0) { | 261 | if ((ah->imask & ATH9K_INT_GENTIMER) == 0) { |
262 | ath9k_hw_set_interrupts(ah, 0); | 262 | ath9k_hw_disable_interrupts(ah); |
263 | ah->imask |= ATH9K_INT_GENTIMER; | 263 | ah->imask |= ATH9K_INT_GENTIMER; |
264 | ath9k_hw_set_interrupts(ah, ah->imask); | 264 | ath9k_hw_set_interrupts(ah, ah->imask); |
265 | } | 265 | } |
@@ -273,7 +273,7 @@ static void ath9k_gen_timer_stop(struct ath_hw *ah, struct ath_gen_timer *timer) | |||
273 | 273 | ||
274 | /* if no timer is enabled, turn off interrupt mask */ | 274 | /* if no timer is enabled, turn off interrupt mask */ |
275 | if (timer_table->timer_mask.val == 0) { | 275 | if (timer_table->timer_mask.val == 0) { |
276 | ath9k_hw_set_interrupts(ah, 0); | 276 | ath9k_hw_disable_interrupts(ah); |
277 | ah->imask &= ~ATH9K_INT_GENTIMER; | 277 | ah->imask &= ~ATH9K_INT_GENTIMER; |
278 | ath9k_hw_set_interrupts(ah, ah->imask); | 278 | ath9k_hw_set_interrupts(ah, ah->imask); |
279 | } | 279 | } |
@@ -310,10 +310,8 @@ static void ath_btcoex_period_timer(unsigned long data) | |||
310 | 310 | ||
311 | timer_period = is_btscan ? btcoex->btscan_no_stomp : | 311 | timer_period = is_btscan ? btcoex->btscan_no_stomp : |
312 | btcoex->btcoex_no_stomp; | 312 | btcoex->btcoex_no_stomp; |
313 | ath9k_gen_timer_start(ah, | 313 | ath9k_gen_timer_start(ah, btcoex->no_stomp_timer, 0, |
314 | btcoex->no_stomp_timer, | 314 | timer_period * 10); |
315 | (ath9k_hw_gettsf32(ah) + | ||
316 | timer_period), timer_period * 10); | ||
317 | btcoex->hw_timer_enabled = true; | 315 | btcoex->hw_timer_enabled = true; |
318 | } | 316 | } |
319 | 317 | ||