commit d9328bec091b784dc09ccc75166f924d82af7177
author qctecmdr <qctecmdr@localhost> Sat Oct 12 08:57:06 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 12 08:57:06 2019 -0700
tree 39a99e8f725b7a1c1f50de78d4317f10432f4caa
parent d20a882baf2643bbb518ff35293d42a021d81c79
parent e25b02a5e16c8d435646e06d03e7dd05d3259752

Merge "asoc: codecs: wcd938x: Fix HPHL mute when ear path teardown"

asoc/codecs/wcd938x/wcd938x.c

diff --git a/asoc/codecs/wcd938x/wcd938x.c b/asoc/codecs/wcd938x/wcd938x.c
index 2980c37..9bc75a0 100644
--- a/asoc/codecs/wcd938x/wcd938x.c
+++ b/asoc/codecs/wcd938x/wcd938x.c
@@ -1048,16 +1048,21 @@
 		}
 		break;
 	case SND_SOC_DAPM_PRE_PMD:
-		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX)
+		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX) {
 			wcd_disable_irq(&wcd938x->irq_info,
 					WCD938X_IRQ_AUX_PDM_WD_INT);
-		else
+			if (wcd938x->update_wcd_event)
+				wcd938x->update_wcd_event(wcd938x->handle,
+						WCD_BOLERO_EVT_RX_MUTE,
+						(WCD_RX3 << 0x10 | 0x1));
+		} else {
 			wcd_disable_irq(&wcd938x->irq_info,
 					WCD938X_IRQ_HPHL_PDM_WD_INT);
-		if (wcd938x->update_wcd_event)
-			wcd938x->update_wcd_event(wcd938x->handle,
+			if (wcd938x->update_wcd_event)
+				wcd938x->update_wcd_event(wcd938x->handle,
 						WCD_BOLERO_EVT_RX_MUTE,
 						(WCD_RX1 << 0x10 | 0x1));
+		}
 		break;
 	case SND_SOC_DAPM_POST_PMD:
 		/* 7 msec delay as per HW requirement */