Merge "ASoc: wcd-mbhc: correct handling of electrical interrupts" (75fb8b78) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd-mbhc-v2.c

+3 −7

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -1593,12 +1593,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_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0);
	wcd_mbhc_report_plug(mbhc, 0, SND_JACK_LINEOUT);		wcd_mbhc_report_plug(mbhc, 0, SND_JACK_LINEOUT);
	} else if (mbhc->current_plug == MBHC_PLUG_TYPE_ANC_HEADPHONE) {		} else if (mbhc->current_plug == MBHC_PLUG_TYPE_ANC_HEADPHONE) {
	mbhc->mbhc_cb->irq_control(codec,		wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_REM, false);
	mbhc->intr_ids->mbhc_hs_rem_intr,		wcd_mbhc_hs_elec_irq(mbhc, WCD_MBHC_ELEC_HS_INS, false);
	false);
	mbhc->mbhc_cb->irq_control(codec,
	mbhc->intr_ids->mbhc_hs_ins_intr,
	false);
	WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_DETECTION_TYPE,		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_DETECTION_TYPE,
	0);		0);
	WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0);		WCD_MBHC_REG_UPDATE_BITS(WCD_MBHC_ELECT_SCHMT_ISRC, 0);