summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/wcd-mbhc-v2.c14
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;