topology: propagate nhlt plugin error to main program

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>

diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c
index 39e95e5a32a27727134a4c9521f1fc21b5ec0e6a..657b9d97f3d2bef60d7cbf33cfde29e7838c75aa 100644 (file)
--- a/topology/nhlt/intel/ssp/ssp-process.c
+++ b/topology/nhlt/intel/ssp/ssp-process.c
@@ -521,7 +521,8 @@ int ssp_calculate(struct intel_nhlt_params *nhlt)
 
        /* calculate blob for every hw config */
        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_calculated(ssp);

diff --git a/topology/pre-processor.c b/topology/pre-processor.c
index c5b260c8f5abaa1b2e57459887e7076e145b666d..dfe3ad62bd1d5326136b206af842159e12f9200f 100644 (file)
--- a/topology/pre-processor.c
+++ b/topology/pre-processor.c
@@ -98,7 +98,7 @@ static int run_plugin(struct tplg_pre_processor *tplg_pp, char *plugin)
        }
 
        /* process plugin */
-       process(tplg_pp->input_cfg, tplg_pp->output_cfg);
+       ret = process(tplg_pp->input_cfg, tplg_pp->output_cfg);
 
 err:
        if (h)
@@ -689,7 +689,7 @@ int pre_process(struct tplg_pre_processor *tplg_pp, char *config, size_t config_
        /* process topology plugins */
        err = pre_process_plugins(tplg_pp);
        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;
        }