From 510baea1e46da47bcaa5e93c664abd84ab6ee21a Mon Sep 17 00:00:00 2001 From: Sujith Manoharan Date: Sun, 1 Mar 2015 11:53:45 +0530 Subject: [PATCH] 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 Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath9k/gpio.c | 3 +-- 1 file changed, 1 insertion(+), 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) if (ath9k_hw_mci_is_enabled(ah)) { sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE; INIT_LIST_HEAD(&sc->btcoex.mci.info); + ath9k_hw_btcoex_init_mci(ah); r = ath_mci_setup(sc); if (r) return r; - - ath9k_hw_btcoex_init_mci(ah); } break; -- 2.39.5