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

Commit d13e3728 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge aa52958f on remote branch

Change-Id: Ic43fcaa2b0f4b082cf3214a23f6ab83c0c74abab
parents 5d44b51c aa52958f
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
@@ -9941,6 +9941,9 @@ static int afe_set_cal_sp_th_vi_cfg(int32_t cal_type, size_t data_size,

	if (cal_data == NULL ||
	    data_size > sizeof(*cal_data) ||
	    (data_size < sizeof(cal_data->cal_hdr) +
		sizeof(cal_data->cal_data) +
		sizeof(cal_data->cal_info.mode)) ||
	    this_afe.cal_data[AFE_FB_SPKR_PROT_TH_VI_CAL] == NULL)
		goto done;

@@ -10158,7 +10161,9 @@ static int afe_get_cal_sp_th_vi_param(int32_t cal_type, size_t data_size,

	if (cal_data == NULL ||
	    data_size > sizeof(*cal_data) ||
	    data_size < sizeof(cal_data->cal_hdr) ||
	    (data_size < sizeof(cal_data->cal_hdr) +
		sizeof(cal_data->cal_data) +
		sizeof(cal_data->cal_info.mode)) ||
	    this_afe.cal_data[AFE_FB_SPKR_PROT_TH_VI_CAL] == NULL)
		return 0;

@@ -10187,8 +10192,7 @@ static int afe_get_cal_spv4_ex_vi_ftm_param(int32_t cal_type, size_t data_size,
	pr_debug("%s: cal_type = %d\n", __func__, cal_type);
	if (this_afe.cal_data[AFE_FB_SPKR_PROT_V4_EX_VI_CAL] == NULL ||
	    cal_data == NULL ||
	    data_size > sizeof(*cal_data) ||
	    data_size < sizeof(cal_data->cal_hdr))
	    data_size != sizeof(*cal_data))
		goto done;

	mutex_lock(&this_afe.cal_data[AFE_FB_SPKR_PROT_V4_EX_VI_CAL]->lock);
@@ -10255,8 +10259,7 @@ static int afe_get_cal_sp_ex_vi_ftm_param(int32_t cal_type, size_t data_size,
	pr_debug("%s: cal_type = %d\n", __func__, cal_type);
	if (this_afe.cal_data[AFE_FB_SPKR_PROT_EX_VI_CAL] == NULL ||
	    cal_data == NULL ||
	    data_size > sizeof(*cal_data) ||
	    data_size < sizeof(cal_data->cal_hdr))
	    data_size != sizeof(*cal_data))
		goto done;

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