asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 04:25:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

topology: propagate nhlt plugin error to main program

Browse source 
Let's propagate nhlt plugin error to main program,
so that we don't generate a wrong nhlt blob silently.

Fixes: https://github.com/alsa-project/alsa-utils/pull/181
Signed-off-by: Chao Song <chao.song@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Chao Song 2022-12-08 14:40:04 +08:00 committed by Jaroslav Kysela
parent 8871d51aa1
commit deaa1635cc
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
topology/nhlt/intel/ssp/ssp-process.c
View file

@ -521,7 +521,8 @@ int ssp_calculate(struct intel_nhlt_params *nhlt)
/* calculate blob for every hw config */ /* calculate blob for every hw config */
for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++) for (i = 0; i < ssp->ssp_hw_config_count[ssp->ssp_count]; i++)
ssp_calculate_intern(nhlt, i); if (ssp_calculate_intern(nhlt, i) < 0)
return -EINVAL;
ssp_print_internal(ssp); ssp_print_internal(ssp);
ssp_print_calculated(ssp); ssp_print_calculated(ssp);

4
topology/pre-processor.c
View file

@ -98,7 +98,7 @@ static int run_plugin(struct tplg_pre_processor *tplg_pp, char *plugin)
} }
/* process plugin */ /* process plugin */
process(tplg_pp->input_cfg, tplg_pp->output_cfg); ret = process(tplg_pp->input_cfg, tplg_pp->output_cfg);
err: err:
if (h) if (h)
@ -689,7 +689,7 @@ int pre_process(struct tplg_pre_processor *tplg_pp, char *config, size_t config_
/* process topology plugins */ /* process topology plugins */
err = pre_process_plugins(tplg_pp); err = pre_process_plugins(tplg_pp);
if (err < 0) { if (err < 0) {
fprintf(stderr, "Unable to run pre-process plugins\n"); fprintf(stderr, "Unable to run pre-process plugins or plugins return error\n");
goto err; goto err;
} }