samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

ASoC: wcd-mbhc: Fix playback pause during lineout insertion

Bläddra i källkod 
Playback pauses during aux cable insertion as removal of
cable is reported followed by insertion. Report removal
of current cable only when headset connected to other end
of extension cable and not lineout.

Change-Id: I08933f4a88493136a518ee72646aa10b1f06eb70
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
This commit is contained in:
Vatsal Bucha
2020-02-21 19:53:59 +05:30
committad av Gerrit - the friendly Code Review server
förälder d155d7f509
incheckning c2e5189852
2 ändrade filer med 7 tillägg och 5 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

1
asoc/codecs/wcd-mbhc-adc.c
Visa fil

@@ -1115,6 +1115,7 @@ static irqreturn_t wcd_mbhc_adc_hs_ins_irq(int irq, void *data)
WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_ISRC_EN, 0); WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_ISRC_EN, 0);
mbhc->is_extn_cable = true; mbhc->is_extn_cable = true;
mbhc->btn_press_intr = false; mbhc->btn_press_intr = false;
mbhc->force_linein = false;
wcd_mbhc_adc_detect_plug_type(mbhc); wcd_mbhc_adc_detect_plug_type(mbhc);
WCD_MBHC_RSC_UNLOCK(mbhc); WCD_MBHC_RSC_UNLOCK(mbhc);
pr_debug("%s: leave\n", __func__); pr_debug("%s: leave\n", __func__);

11
asoc/codecs/wcd-mbhc-v2.c
Visa fil

@@ -641,11 +641,12 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion,
} }
mbhc->hph_type = WCD_MBHC_HPH_NONE; mbhc->hph_type = WCD_MBHC_HPH_NONE;
mbhc->zl = mbhc->zr = 0; mbhc->zl = mbhc->zr = 0;
pr_debug("%s: Reporting removal (%x)\n", if (!mbhc->force_linein) {
__func__, mbhc->hph_status); pr_debug("%s: Reporting removal (%x)\n",
wcd_mbhc_jack_report(mbhc, &mbhc->headset_jack, __func__, mbhc->hph_status);
0, WCD_MBHC_JACK_MASK); wcd_mbhc_jack_report(mbhc, &mbhc->headset_jack,
0, WCD_MBHC_JACK_MASK);
}
if (mbhc->hph_status == SND_JACK_LINEOUT) { if (mbhc->hph_status == SND_JACK_LINEOUT) {
pr_debug("%s: Enable micbias\n", __func__); pr_debug("%s: Enable micbias\n", __func__);