2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.c b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
index 51ecc9b2df8c..7bdbc7a7d7ad 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_aic.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
@@ -40,6 +40,12 @@ static bool ar9003_hw_is_aic_enabled(struct ath_hw *ah)
 {
         struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
 
+        /*
+         * Disable AIC for now, until we have all the
+         * HW code and the driver-layer support ready.
+         */
+        return false;
+
         if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_AIC)
                 return false;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index 20bb5b990127..6fa98e51fdfc 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -1364,7 +1364,8 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
                 mci->need_flush_btinfo = false;
                 break;
         case MCI_STATE_AIC_CAL_SINGLE:
-                value = ar9003_aic_calibration_single(ah);
+                if (ath9k_hw_is_aic_enabled(ah))
+                        value = ar9003_aic_calibration_single(ah);
                 break;
         default:
                 break;