Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 017d9491 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: pcm: Drop incorrect double/extra frees 



The changes in "ASoC: pcm: free path list before exiting from error
conditions" actually introduced both double frees (in case where the
path list was allocated but empty) and frees of unallocated memory (in
cases where the error being handled was -ENOMEM.  Drop the commit for
now.

Fixes: e4ad1acc (ASoC: pcm: free path list before exiting from error conditions)
Reported-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
parent dcb99fd9

sound/soc/soc-pcm.c

+0 −3
Original line number Diff line number Diff line
@@ -1989,7 +1989,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) 


		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_PLAYBACK, &list);

		if (paths < 0) {

			dpcm_path_put(&list);

			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",

					fe->dai_link->name,  "playback");

			mutex_unlock(&card->mutex);
@@ -2019,7 +2018,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card) 


		paths = dpcm_path_get(fe, SNDRV_PCM_STREAM_CAPTURE, &list);

		if (paths < 0) {

			dpcm_path_put(&list);

			dev_warn(fe->dev, "ASoC: %s no valid %s path\n",

					fe->dai_link->name,  "capture");

			mutex_unlock(&card->mutex);
@@ -2084,7 +2082,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream) 
	fe->dpcm[stream].runtime = fe_substream->runtime;



	if (dpcm_path_get(fe, stream, &list) <= 0) {

		dpcm_path_put(&list);

		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",

			fe->dai_link->name, stream ? "capture" : "playback");

	}