evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: qdsp6v2: Remove size checks when finding ADM cal"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-22 23:41:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2277a4c12d
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/msm/qdsp6v2/q6adm.c
View file

@ -1999,13 +1999,11 @@ static struct cal_block_data *adm_find_cal_by_path(int cal_index, int path)
if (cal_index == ADM_AUDPROC_CAL) {
audproc_cal_info = cal_block->cal_info;
if ((audproc_cal_info->path == path) &&
(cal_block->cal_data.size > 0))
if (audproc_cal_info->path == path)
return cal_block;
} else if (cal_index == ADM_AUDVOL_CAL) {
audvol_cal_info = cal_block->cal_info;
if ((audvol_cal_info->path == path) &&
(cal_block->cal_data.size > 0))
if (audvol_cal_info->path == path)
return cal_block;
}
}
@ -2032,14 +2030,12 @@ static struct cal_block_data *adm_find_cal_by_app_type(int cal_index, int path,
if (cal_index == ADM_AUDPROC_CAL) {
audproc_cal_info = cal_block->cal_info;
if ((audproc_cal_info->path == path) &&
(audproc_cal_info->app_type == app_type) &&
(cal_block->cal_data.size > 0))
(audproc_cal_info->app_type == app_type))
return cal_block;
} else if (cal_index == ADM_AUDVOL_CAL) {
audvol_cal_info = cal_block->cal_info;
if ((audvol_cal_info->path == path) &&
(audvol_cal_info->app_type == app_type) &&
(cal_block->cal_data.size > 0))
(audvol_cal_info->app_type == app_type))
return cal_block;
}
}
@ -2070,15 +2066,13 @@ static struct cal_block_data *adm_find_cal(int cal_index, int path,
if ((audproc_cal_info->path == path) &&
(audproc_cal_info->app_type == app_type) &&
(audproc_cal_info->acdb_id == acdb_id) &&
(audproc_cal_info->sample_rate == sample_rate) &&
(cal_block->cal_data.size > 0))
(audproc_cal_info->sample_rate == sample_rate))
return cal_block;
} else if (cal_index == ADM_AUDVOL_CAL) {
audvol_cal_info = cal_block->cal_info;
if ((audvol_cal_info->path == path) &&
(audvol_cal_info->app_type == app_type) &&
(audvol_cal_info->acdb_id == acdb_id) &&
(cal_block->cal_data.size > 0))
(audvol_cal_info->acdb_id == acdb_id))
return cal_block;
}
}