Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cee7ead authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents fba4b34b 29a5874d

asoc/codecs/wcd-mbhc-adc.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */

#include <linux/module.h>

#include <linux/init.h>
@@ -1113,6 +1113,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);

	mbhc->is_extn_cable = true;

	mbhc->btn_press_intr = false;

	mbhc->force_linein = false;

	wcd_mbhc_adc_detect_plug_type(mbhc);

	WCD_MBHC_RSC_UNLOCK(mbhc);

	pr_debug("%s: leave\n", __func__);

asoc/codecs/wcd-mbhc-v2.c

+6 −5
Original line number Diff line number Diff line
@@ -634,11 +634,12 @@ void wcd_mbhc_report_plug(struct wcd_mbhc *mbhc, int insertion, 
			}

			mbhc->hph_type = WCD_MBHC_HPH_NONE;

			mbhc->zl = mbhc->zr = 0;

			if (!mbhc->force_linein) {

				pr_debug("%s: Reporting removal (%x)\n",

					 __func__, mbhc->hph_status);

				wcd_mbhc_jack_report(mbhc, &mbhc->headset_jack,

					0, WCD_MBHC_JACK_MASK);



			}

			if (mbhc->hph_status == SND_JACK_LINEOUT) {



				pr_debug("%s: Enable micbias\n", __func__);