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

Commit ac4d5daf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoc: wcd-mbhc: correct handling of electrical interrupts"

parents 4db17402 9870f9f6

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

+2 −6
Original line number Diff line number Diff line
@@ -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);