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

Unverified Commit 09f448a4 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: compress: Fix memory leak from snd_soc_new_compress 



Change kzalloc to devm_kzalloc, so compr gets automatically freed when
it's no longer needed.

Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8a5b0177

sound/soc/soc-compress.c

+6 −11
Original line number Diff line number Diff line
@@ -896,16 +896,14 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
	else

		direction = SND_COMPRESS_CAPTURE;



	compr = kzalloc(sizeof(*compr), GFP_KERNEL);

	compr = devm_kzalloc(rtd->card->dev, sizeof(*compr), GFP_KERNEL);

	if (!compr)

		return -ENOMEM;



	compr->ops = devm_kzalloc(rtd->card->dev, sizeof(soc_compr_ops),

				  GFP_KERNEL);

	if (!compr->ops) {

		ret = -ENOMEM;

		goto compr_err;

	}

	if (!compr->ops)

		return -ENOMEM;



	if (rtd->dai_link->dynamic) {

		snprintf(new_name, sizeof(new_name), "(%s)",
@@ -918,7 +916,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
			dev_err(rtd->card->dev,

				"Compress ASoC: can't create compressed for %s: %d\n",

				rtd->dai_link->name, ret);

			goto compr_err;

			return ret;

		}



		rtd->pcm = be_pcm;
@@ -954,7 +952,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
		dev_err(component->dev,

			"Compress ASoC: can't create compress for codec %s: %d\n",

			component->name, ret);

		goto compr_err;

		return ret;

	}



	/* DAPM dai link stream work */
@@ -965,10 +963,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 


	dev_info(rtd->card->dev, "Compress ASoC: %s <-> %s mapping ok\n",

		 codec_dai->name, cpu_dai->name);

	return ret;



compr_err:

	kfree(compr);

	return ret;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_new_compress);