summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPhani Kumar Uppalapati <phaniu@codeaurora.org>2016-02-26 17:56:43 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-25 16:02:34 -0700
commit07ceb38173c00cc36d74500ed1742a8daf2d66a0 (patch)
tree2c9428d8540fb7a7c38569ebb96589166a1187d5 /sound
parent4aaf0c05a5b197420168e1499363a0f178c163d2 (diff)
ASoC: wcd-mbhc: Avoid fake headset report during headphone remove
When headphone is removed while 3 second polling is still in progress, mbhc hs comparator result will be read as "0" and this causes reporting a fake headset insert event to user-space followed by headphone removal. Avoid sending this fake headset insert event to user-space by checking for the microphone clamp bit from codec mbhc hardware. CRs-fixed: 941089 Change-Id: I96d96dca92a6c99bbb25ab70a2706e730c28818b Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wcd-mbhc-v2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index e04b12b698ce..33cce5ee17cc 100644
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -1311,6 +1311,7 @@ correct_plug_type:
MBHC_PLUG_TYPE_HEADSET) &&
(mbhc->current_plug !=
MBHC_PLUG_TYPE_ANC_HEADPHONE)) &&
+ !wcd_swch_level_remove(mbhc) &&
!mbhc->btn_press_intr) {
pr_debug("%s: cable is %sheadset\n",
__func__,