diff options
| author | Dharageswari.R <dharageswari.r@intel.com> | 2016-04-28 18:45:25 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-02 12:02:17 +0100 |
| commit | 95536d8c29985167e745ff0d8c7cd7dcf4318e6b (patch) | |
| tree | a0026e597bfa294973def2136ec27f34aae2d211 /sound/soc/intel | |
| parent | 0ce8428ba9ea13098b828d0881e28368a108709c (diff) | |
| download | op-kernel-dev-95536d8c29985167e745ff0d8c7cd7dcf4318e6b.zip op-kernel-dev-95536d8c29985167e745ff0d8c7cd7dcf4318e6b.tar.gz | |
ASoC: Intel: Skylake: Fix the NULL pointer exception in dsp_clean up
If request firmware fails at init, the code loader DMA allocation
can be NULL, so check for boot complete before freeing up these
resources
Signed-off-by: Dharageswari R <dharageswari.r@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/skylake/skl-sst-dsp.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/skylake/skl-sst.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/intel/skylake/skl-sst-dsp.c b/sound/soc/intel/skylake/skl-sst-dsp.c index 2962ef2..13c1985 100644 --- a/sound/soc/intel/skylake/skl-sst-dsp.c +++ b/sound/soc/intel/skylake/skl-sst-dsp.c @@ -336,8 +336,6 @@ void skl_dsp_free(struct sst_dsp *dsp) skl_ipc_int_disable(dsp); free_irq(dsp->irq, dsp); - dsp->cl_dev.ops.cl_cleanup_controller(dsp); - skl_cldma_int_disable(dsp); skl_ipc_op_int_disable(dsp); skl_ipc_int_disable(dsp); diff --git a/sound/soc/intel/skylake/skl-sst.c b/sound/soc/intel/skylake/skl-sst.c index bec4a7c..13ec8d5 100644 --- a/sound/soc/intel/skylake/skl-sst.c +++ b/sound/soc/intel/skylake/skl-sst.c @@ -454,6 +454,10 @@ void skl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx) skl_clear_module_table(ctx->dsp); skl_ipc_free(&ctx->ipc); ctx->dsp->ops->free(ctx->dsp); + if (ctx->boot_complete) { + ctx->dsp->cl_dev.ops.cl_cleanup_controller(ctx->dsp); + skl_cldma_int_disable(ctx->dsp); + } } EXPORT_SYMBOL_GPL(skl_sst_dsp_cleanup); |
