aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index cd1bc9c2752..7ca6e3aa7bc 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1391,7 +1391,7 @@ static void ath_btcoex_period_timer(unsigned long data)
1391 1391
1392 spin_lock_bh(&btcoex->btcoex_lock); 1392 spin_lock_bh(&btcoex->btcoex_lock);
1393 1393
1394 ath_btcoex_bt_stomp(sc, btinfo, btinfo->bt_stomp_type); 1394 ath_btcoex_bt_stomp(sc, btinfo, btcoex->bt_stomp_type);
1395 1395
1396 spin_unlock_bh(&btcoex->btcoex_lock); 1396 spin_unlock_bh(&btcoex->btcoex_lock);
1397 1397
@@ -1426,9 +1426,9 @@ static void ath_btcoex_no_stomp_timer(void *arg)
1426 1426
1427 spin_lock_bh(&btcoex->btcoex_lock); 1427 spin_lock_bh(&btcoex->btcoex_lock);
1428 1428
1429 if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_LOW) 1429 if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW)
1430 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_NONE); 1430 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_NONE);
1431 else if (btinfo->bt_stomp_type == ATH_BTCOEX_STOMP_ALL) 1431 else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
1432 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_LOW); 1432 ath_btcoex_bt_stomp(sc, btinfo, ATH_BTCOEX_STOMP_LOW);
1433 1433
1434 spin_unlock_bh(&btcoex->btcoex_lock); 1434 spin_unlock_bh(&btcoex->btcoex_lock);
@@ -1687,6 +1687,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid)
1687 goto bad2; 1687 goto bad2;
1688 qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE); 1688 qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
1689 ath9k_hw_init_btcoex_hw_info(ah, qnum); 1689 ath9k_hw_init_btcoex_hw_info(ah, qnum);
1690 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
1690 break; 1691 break;
1691 default: 1692 default:
1692 WARN_ON(1); 1693 WARN_ON(1);