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

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

Merge "ASoC: msm8x16-wcd: send notifier to mbhc for pre PA off event"

parents 98d762b8 cf8c2730

sound/soc/codecs/msm8x16-wcd.c

+4 −0
Original line number Diff line number Diff line
@@ -3744,6 +3744,8 @@ static int msm8x16_wcd_hph_pa_event(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_RX_HPH_L_TEST, 0x04, 0x00);

			msm8x16_wcd->mute_mask |= HPHL_PA_DISABLE;

			msm8x16_notifier_call(codec,

					WCD_EVENT_PRE_HPHL_PA_OFF);

		} else if (w->shift == 4) {

			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_CDC_RX2_B6_CTL, 0x01, 0x01);
@@ -3751,6 +3753,8 @@ static int msm8x16_wcd_hph_pa_event(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

				MSM8X16_WCD_A_ANALOG_RX_HPH_R_TEST, 0x04, 0x00);

			msm8x16_wcd->mute_mask |= HPHR_PA_DISABLE;

			msm8x16_notifier_call(codec,

					WCD_EVENT_PRE_HPHR_PA_OFF);

		}

		if (get_codec_version(msm8x16_wcd) >= CAJON) {

			snd_soc_update_bits(codec,