commit d1ffd16b665c6f152c313617fe8185c2774bb7e3
author qctecmdr <qctecmdr@localhost> Mon Mar 30 05:29:32 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 30 05:29:32 2020 -0700
tree 64cb464ebbafc5a7201e9979c1e86b988dc142a3
parent f77c08ced544c452db34e3f601d63d64a3d9cbf5
parent 849ebb85cbd85ad8db1068518f6d1c83ede40218

Merge "ASoC: wcd-mbhc: Disable moisture detect threshold if duty cycle disabled"

asoc/codecs/wcd-mbhc-v2.c

diff --git a/asoc/codecs/wcd-mbhc-v2.c b/asoc/codecs/wcd-mbhc-v2.c
index f3e71af..3692ed7 100644
--- a/asoc/codecs/wcd-mbhc-v2.c
+++ b/asoc/codecs/wcd-mbhc-v2.c
@@ -1376,8 +1376,7 @@
 	if (mbhc->mbhc_cfg->moisture_en && mbhc->mbhc_cb->mbhc_moisture_config
 		&& !mbhc->mbhc_cfg->moisture_duty_cycle_en)
 		mbhc->mbhc_cb->mbhc_moisture_config(mbhc);
-	else if (mbhc->mbhc_cfg->moisture_duty_cycle_en &&
-		 mbhc->mbhc_cb->mbhc_moisture_detect_en)
+	else if (mbhc->mbhc_cb->mbhc_moisture_detect_en)
 		mbhc->mbhc_cb->mbhc_moisture_detect_en(mbhc, false);
 
 	/*