diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-03 06:27:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-03 06:27:00 -0800 |
| commit | ac4d5daf0228d1cd4f3ad7188c205acc5d951559 (patch) | |
| tree | 7ec58d7a878c79a2a85969947d4a1846a40abc37 /sound/soc | |
| parent | 4db174025d4e9307cf40969f7b5a453111f2fb61 (diff) | |
| parent | 9870f9f6da81f57733b885c8b74a1b548d7b8b17 (diff) | |
Merge "ASoc: wcd-mbhc: correct handling of electrical interrupts"
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wcd-mbhc-v2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index cb201899b4b8..8454ebfc6216 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1610,12 +1610,8 @@ static void wcd_mbhc_swch_irq_handler(struct wcd_mbhc *mbhc) WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0); wcd_mbhc_report_plug(mbhc, 0, SND_JACK_LINEOUT); } else if (mbhc->current_plug == MBHC_PLUG_TYPE_ANC_HEADPHONE) { - mbhc->mbhc_cb->irq_control(codec, - mbhc->intr_ids->mbhc_hs_rem_intr, - false); - mbhc->mbhc_cb->irq_control(codec, - mbhc->intr_ids->mbhc_hs_ins_intr, - false); + wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_REM, false); + wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_INS, false); WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_DETECTION_TYPE, 0); WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0); |