diff options
| author | Laxminath Kasam <lkasam@codeaurora.org> | 2016-02-03 16:28:28 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:19:37 -0700 |
| commit | 73f564a2c281bbdc2223cea9cf3bd9fca856ca29 (patch) | |
| tree | c6e3daf66dafb40043d6fdeb463f67bb53479649 | |
| parent | ac0f3e75de4161c00a512a1b3eb51b00039ba45f (diff) | |
Revert "ASoC: wcd-mbhc: Fix plug removal detection from extension cable"
This reverts commit 099e839e730b89630404bfc9a375049ac01b8f93 ("ASoC:
wcd-mbhc: Fix plug removal detection from extension cable")'.
Headset insertion is giving spurious electrical insertion removal
interrupts. Hence headset is not detected properly. This is seen on
RCM devices for normal US headset on 8937/msmgold/msmtitanium. On MTP
some specific headsets are exhibiting this behavior.
Change-Id: Ida016cc29950dabcaaf6bfc1b751e77e3cccd20c
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
| -rw-r--r-- | sound/soc/codecs/wcd-mbhc-v2.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index 91cfa514ef31..74287a1e74cb 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1376,15 +1376,6 @@ exit: micbias2 = mbhc->mbhc_cb->micbias_enable_status(mbhc, MIC_BIAS_2); } - - if (mbhc->mbhc_cfg->detect_extn_cable && - ((plug_type == MBHC_PLUG_TYPE_HEADPHONE) || - (plug_type == MBHC_PLUG_TYPE_HEADSET)) && - !mbhc->hs_detect_work_stop) { - WCD_MBHC_RSC_LOCK(mbhc); - wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_REM, true); - WCD_MBHC_RSC_UNLOCK(mbhc); - } if (mbhc->mbhc_cb->set_cap_mode) mbhc->mbhc_cb->set_cap_mode(codec, micbias1, micbias2); @@ -1737,10 +1728,6 @@ static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data) } } while (!time_after(jiffies, timeout)); - if (wcd_swch_level_remove(mbhc)) { - pr_debug("%s: Switch level is low ", __func__); - goto exit; - } pr_debug("%s: headset %s actually removed\n", __func__, removed ? "" : "not "); @@ -1775,7 +1762,6 @@ static irqreturn_t wcd_mbhc_hs_rem_irq(int irq, void *data) } } } -exit: WCD_MBHC_RSC_UNLOCK(mbhc); pr_debug("%s: leave\n", __func__); return IRQ_HANDLED; |