Merge "ASoC: wcd9xxx: Enable MBHC_MUX_MODE when polling is active"
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c
index 362a9ca..73fd16d 100644
--- a/sound/soc/codecs/wcd9xxx-mbhc.c
+++ b/sound/soc/codecs/wcd9xxx-mbhc.c
@@ -4193,10 +4193,11 @@
(1 << MBHC_EVENT_PA_HPHL | 1 << MBHC_EVENT_PA_HPHR))
wcd9xxx_switch_micbias(mbhc, 1);
/*
- * Disable MBHC TxFE, in case it was enabled
- * earlier when micbias was enabled.
+ * Disable MBHC TxFE, in case it was enabled earlier
+ * when micbias was enabled and polling is not active.
*/
- wcd9xxx_enable_mbhc_txfe(mbhc, false);
+ if (!mbhc->polling_active)
+ wcd9xxx_enable_mbhc_txfe(mbhc, false);
}
break;
/* PA usage change */