diff options
| author | Jeeja KP | 2016-03-28 18:41:30 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-03-28 11:38:00 +0200 |
| commit | d643678b9a4e432a574b2ec601216afd720c69b6 (patch) | |
| tree | 9a5d2d7ae2710da4c6c7656c6ead275fb73467b3 /sound/soc/intel/skylake/skl-topology.c | |
| parent | ASoC: Intel: Skylake: Fix kbuild dependency (diff) | |
| download | kernel-qcow2-linux-d643678b9a4e432a574b2ec601216afd720c69b6.tar.gz kernel-qcow2-linux-d643678b9a4e432a574b2ec601216afd720c69b6.tar.xz kernel-qcow2-linux-d643678b9a4e432a574b2ec601216afd720c69b6.zip | |
ASoC: Intel: Skylake: Fix for unloading module only when it is loaded
Module needs to be unloaded only when it is loaded successfully.
To fix this, first correct the module state sequence and set module
state to LOADED if module is loaded successfully.
When unloading the module check if module state is not in UNINIT,
then unload it.
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 545b4e77b8aa..3f393cbe1bfe 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -490,6 +490,8 @@ skl_tplg_init_pipe_modules(struct skl *skl, struct skl_pipe *pipe) mconfig->id.module_id, mconfig->guid); if (ret < 0) return ret; + + mconfig->m_state = SKL_MODULE_LOADED; } /* update blob if blob is null for be with default value */ @@ -524,7 +526,8 @@ static int skl_tplg_unload_pipe_modules(struct skl_sst *ctx, list_for_each_entry(w_module, &pipe->w_list, node) { mconfig = w_module->w->priv; - if (mconfig->is_loadable && ctx->dsp->fw_ops.unload_mod) + 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->id.module_id); } |