diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
| commit | 8317e2047ef7d70dd76bf1d571fecaa8d4deb06f (patch) | |
| tree | c400a600a4eb00da224b4e59e76396655e853d07 /drivers/net/wireless/ath/ath9k/gpio.c | |
| parent | 2c55a3d08ade44a778c182c220a7907ec65d5fb8 (diff) | |
| parent | 39338b56382ac640614851a80e0bd71994cc664d (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/gpio.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c index 2c279dcaf4ba..e4ae08e07719 100644 --- a/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c @@ -198,6 +198,7 @@ static void ath_btcoex_period_timer(unsigned long data) ath9k_hw_btcoex_bt_stomp(ah, is_btscan ? ATH_BTCOEX_STOMP_ALL : btcoex->bt_stomp_type); + ath9k_hw_btcoex_enable(ah); spin_unlock_bh(&btcoex->btcoex_lock); if (btcoex->btcoex_period != btcoex->btcoex_no_stomp) { @@ -240,6 +241,7 @@ static void ath_btcoex_no_stomp_timer(void *arg) else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL) ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW); + ath9k_hw_btcoex_enable(ah); spin_unlock_bh(&btcoex->btcoex_lock); ath9k_ps_restore(sc); } |