From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre-Louis Bossart Subject: Re: [PATCH 1/2] ASoC: topology: free stream_name of dai_drv Date: Wed, 6 Mar 2019 11:56:02 -0600 Message-ID: References: <20190305155753.10362-1-yung-chuan.liao@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C7445F806F7 for ; Wed, 6 Mar 2019 18:56:06 +0100 (CET) In-Reply-To: <20190305155753.10362-1-yung-chuan.liao@linux.intel.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" To: Bard liao , broonie@kernel.org Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com, alsa-devel@alsa-project.org, bard.liao@intel.com List-Id: alsa-devel@alsa-project.org On 3/5/19 9:57 AM, Bard liao wrote: > The stream_name is allocated by kstrdup. We have to free it when the > dai is removed or return from error. > > Signed-off-by: Bard liao I reviewed and verified the flows, so both patch1 and 2: Acked-by: Pierre-Louis Bossart Thanks! > --- > sound/soc/soc-topology.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c > index 25fca7055464..4e05ef001e04 100644 > --- a/sound/soc/soc-topology.c > +++ b/sound/soc/soc-topology.c > @@ -535,6 +535,8 @@ static void remove_dai(struct snd_soc_component *comp, > if (dai->driver == dai_drv) > dai->driver = NULL; > > + kfree(dai_drv->playback.stream_name); > + kfree(dai_drv->capture.stream_name); > kfree(dai_drv->name); > list_del(&dobj->list); > kfree(dai_drv); > @@ -1806,6 +1808,9 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, > ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL); > if (ret < 0) { > dev_err(tplg->comp->dev, "ASoC: DAI loading failed\n"); > + kfree(dai_drv->playback.stream_name); > + kfree(dai_drv->capture.stream_name); > + kfree(dai_drv->name); > kfree(dai_drv); > return ret; > }