ASoC: msm: qdsp6v2: fix to remove ftm_cfg mode update

Speaker FTM(factory test mode) configuration mode is reset
during afe_set_cal_fb_spkr_prot() API which is causing FTM
mode to be overwritten if afe_set_cal_fb_spkr_prot() API
is called before FTM mode sent to DSP. Fix this issue by
not resetting FTM mode.

Change-Id: Ic1112a66b6e1413441f408b74609c621c770534b
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
This commit is contained in:
Vidyakumar Athota 2017-03-03 11:03:22 -08:00 committed by Gerrit - the friendly Code Review server
parent 2a7bbea49b
commit dcba29af2d

View file

@ -6711,8 +6711,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;
@ -6854,8 +6852,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: