alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: liam.r.girdwood@linux.intel.com, patches.audio@intel.com,
	broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>,
	Jeeja KP <jeeja.kp@intel.com>
Subject: [PATCH 7/7] ASoC: Intel: Skylake: Move up pipe mem free
Date: Mon, 23 Nov 2015 22:26:29 +0530	[thread overview]
Message-ID: <1448297789-6524-8-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1448297789-6524-1-git-send-email-vinod.koul@intel.com>

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>
---
 sound/soc/intel/skylake/skl-topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 698c4aa03933..f221c758d601 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;
 }
-- 
1.9.1

  parent reply	other threads:[~2015-11-23 16:53 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-23 16:56 [PATCH 0/7] ASoC: Intel: Skylake: Fix suspend issues Vinod Koul
2015-11-23 16:56 ` [PATCH 1/7] ASoC: Intel: Skylake: Add Resume capability in PCM info Vinod Koul
2015-11-23 18:45   ` Takashi Iwai
2015-11-24  2:44     ` Vinod Koul
2015-11-24  6:07       ` Takashi Iwai
2015-11-26  8:56         ` Vinod Koul
2015-11-26  9:06           ` Takashi Iwai
2016-01-10 12:22   ` Applied "ASoC: Intel: Skylake: Add Resume capability in PCM info." to the asoc tree Mark Brown
2015-11-23 16:56 ` [PATCH 2/7] ASoC: Intel: Skylake: Reconfigure HDA stream register in prepare/resume Vinod Koul
2015-11-25 17:57   ` Applied "ASoC: Intel: Skylake: Reconfigure HDA stream register in prepare/resume" to the asoc tree Mark Brown
2015-11-23 16:56 ` [PATCH 3/7] ASoC: Intel: Skylake: Fix to update bit depth for module params Vinod Koul
2015-11-25 17:57   ` Applied "ASoC: Intel: Skylake: Fix to update bit depth for module params" to the asoc tree Mark Brown
2015-11-23 16:56 ` [PATCH 4/7] ASoC: Intel: Skylake: Update pcm capability Vinod Koul
2015-11-25 17:57   ` Applied "ASoC: Intel: Skylake: Update pcm capability" to the asoc tree Mark Brown
2015-11-23 16:56 ` [PATCH 5/7] ASoC: Intel: Skylake: Poll CLDMA RUN bit when set Vinod Koul
2015-11-25 17:57   ` Applied "ASoC: Intel: Skylake: Poll CLDMA RUN bit when set" to the asoc tree Mark Brown
2015-11-23 16:56 ` [PATCH 6/7] ASoC: Intel: Skylake: Clear stream registers before setting up stream Vinod Koul
2015-11-23 16:56 ` Vinod Koul [this message]
2015-11-25 17:57   ` Applied "ASoC: Intel: Skylake: Move up pipe mem free" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448297789-6524-8-git-send-email-vinod.koul@intel.com \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jeeja.kp@intel.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=patches.audio@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).