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

Commit 4b7986ea 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: qdsp6v2: fix to remove ftm_cfg mode update"

parents e52fa20d dcba29af

sound/soc/msm/qdsp6v2/q6afe.c

+0 −4
Original line number Diff line number Diff line
@@ -6692,8 +6692,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;
@@ -6835,8 +6833,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: