diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-11-23 22:26:29 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-25 17:55:46 +0000 |
| commit | 65976878ca692566ed066f4fa977de517f697c59 (patch) | |
| tree | 02e70e9b4b5676f5099e5250b828ff8bebcdf200 /sound | |
| parent | 2434caf098588856d1c332d2f60b8a2d8a198450 (diff) | |
| download | op-kernel-dev-65976878ca692566ed066f4fa977de517f697c59.zip op-kernel-dev-65976878ca692566ed066f4fa977de517f697c59.tar.gz | |
ASoC: Intel: Skylake: Move up pipe mem free
The MCPS is freed first thing in pmd events but non memory. So if
we face error during teardown we leak this mem, so move the code
up
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')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 698c4aa..f221c75 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -652,6 +652,7 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w, int ret = 0; skl_tplg_free_pipe_mcps(skl, mconfig); + skl_tplg_free_pipe_mem(skl, mconfig); list_for_each_entry(w_module, &s_pipe->w_list, node) { dst_module = w_module->w->priv; @@ -670,7 +671,6 @@ static int skl_tplg_mixer_dapm_post_pmd_event(struct snd_soc_dapm_widget *w, } ret = skl_delete_pipe(ctx, mconfig->pipe); - skl_tplg_free_pipe_mem(skl, mconfig); return ret; } |
