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

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

Merge "ASoC: msm_sdw: Fix crash after SSR on speaker+BT ringtone"

parents 1836aa61 5e4b0e6b

sound/soc/codecs/msm_sdw/msm_sdw_cdc.c

+1 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,7 @@ static int msm_sdw_notifier_service_cb(struct notifier_block *nb, 
	mutex_lock(&msm_sdw->codec_mutex);

	switch (opcode) {

	case AUDIO_NOTIFIER_SERVICE_DOWN:

		msm_sdw->int_mclk1_enabled = false;

		msm_sdw->dev_up = false;

		for (i = 0; i < msm_sdw->nr; i++)

			swrm_wcd_notify(msm_sdw->sdw_ctrl_data[i].sdw_pdev,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+2 −0
Original line number Diff line number Diff line
@@ -12361,6 +12361,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"MultiMedia2 Mixer", "SLIM_8_TX", "SLIMBUS_8_TX"},

	{"MultiMedia1 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia1 Mixer", "PRI_MI2S_TX", "PRI_MI2S_TX"},

	{"MultiMedia2 Mixer", "SEC_MI2S_TX", "SEC_MI2S_TX"},

	{"MultiMedia6 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},

	{"MultiMedia6 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},

	{"MultiMedia3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
@@ -12954,6 +12955,7 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{"VOIP_UL", NULL, "VOC_EXT_EC MUX"},

	{"VoLTE_UL", NULL, "VOC_EXT_EC MUX"},

	{"VOICE2_UL", NULL, "VOC_EXT_EC MUX"},

	{"VoWLAN_UL", NULL, "VOC_EXT_EC MUX"},

	{"VOICEMMODE1_UL", NULL, "VOC_EXT_EC MUX"},

	{"VOICEMMODE2_UL", NULL, "VOC_EXT_EC MUX"},

























sound/soc/msm/qdsp6v2/q6afe.c



+0
−4




























Original line number
Diff line number
Diff line








@@ -6695,8 +6695,6 @@ static int afe_set_cal_fb_spkr_prot(int32_t cal_type, size_t data_size,













	mutex_lock(&this_afe.cal_data[AFE_FB_SPKR_PROT_CAL]->lock);















	memcpy(&this_afe.prot_cfg, &cal_data->cal_info,















		sizeof(this_afe.prot_cfg));













	this_afe.th_ftm_cfg.mode = this_afe.prot_cfg.mode;













	this_afe.ex_ftm_cfg.mode = this_afe.prot_cfg.mode;















	mutex_unlock(&this_afe.cal_data[AFE_FB_SPKR_PROT_CAL]->lock);















done:















	return ret;










@@ -6839,8 +6837,6 @@ static int afe_get_cal_fb_spkr_prot(int32_t cal_type, size_t data_size,













		cal_data->cal_info.r0[SP_V2_SPKR_1] = -1;















		cal_data->cal_info.r0[SP_V2_SPKR_2] = -1;















	}













	this_afe.th_ftm_cfg.mode = this_afe.prot_cfg.mode;













	this_afe.ex_ftm_cfg.mode = this_afe.prot_cfg.mode;















	mutex_unlock(&this_afe.cal_data[AFE_FB_SPKR_PROT_CAL]->lock);















	__pm_relax(&wl.ws);















done: