aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2015-03-01 01:23:45 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-03-03 08:46:53 -0500
commit510baea1e46da47bcaa5e93c664abd84ab6ee21a (patch)
tree028c0d0f8f319590463d22160b8d3f892b248318 /drivers
parent44b9b56e509508ceeaadd33da66df9d85e576d47 (diff)
ath9k: Initialize MCI state correctly
The MCI configuration values are assigned in ath9k_hw_btcoex_init_mci() which are used by the MCI reset routine. When initializing BTCOEX/MCI, ath_mci_setup() ends up using uninitialized data. Fix this by setting up the configuration parameters before issuing a MCI reset. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/gpio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 78695b59d6fc..257ffce9373a 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -415,12 +415,11 @@ int ath9k_init_btcoex(struct ath_softc *sc)
415 if (ath9k_hw_mci_is_enabled(ah)) { 415 if (ath9k_hw_mci_is_enabled(ah)) {
416 sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE; 416 sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
417 INIT_LIST_HEAD(&sc->btcoex.mci.info); 417 INIT_LIST_HEAD(&sc->btcoex.mci.info);
418 ath9k_hw_btcoex_init_mci(ah);
418 419
419 r = ath_mci_setup(sc); 420 r = ath_mci_setup(sc);
420 if (r) 421 if (r)
421 return r; 422 return r;
422
423 ath9k_hw_btcoex_init_mci(ah);
424 } 423 }
425 424
426 break; 425 break;