ASoC: Intel: Skylake: Unload all the loadable modules

There could be more than one loadable module in a pipeline.
So unload all modules whilst parsing the list.

Signed-off-by: Dharageswari R <dharageswari.r@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 6bceab8f0bac..2d475b720963 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -523,6 +523,7 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe)
 static int skl_tplg_unload_pipe_modules(struct skl_sst *ctx,
          struct skl_pipe *pipe)
 {
+        int ret;
         struct skl_pipe_module *w_module = NULL;
         struct skl_module_cfg *mconfig = NULL;
 
@@ -530,9 +531,12 @@ static int skl_tplg_unload_pipe_modules(struct skl_sst *ctx,
                 mconfig  = w_module->w->priv;
 
                 if (mconfig->is_loadable && ctx->dsp->fw_ops.unload_mod &&
-                        mconfig->m_state > SKL_MODULE_UNINIT)
-                        return ctx->dsp->fw_ops.unload_mod(ctx->dsp,
+                        mconfig->m_state > SKL_MODULE_UNINIT) {
+                        ret = ctx->dsp->fw_ops.unload_mod(ctx->dsp,
                                                 mconfig->id.module_id);
+                        if (ret < 0)
+                                return -EIO;
+                }
         }
 
         /* no modules to unload in this path, so return */