Unverified Commit 1b08e769 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mark Brown
Browse files

ASoC: sprd: Simplify memory allocation in sprd_platform_compr_dma_config() 



'sg' is freed at the end sprd_platform_compr_dma_config() both in the
normal and in the error handling path.

There is no need to use the devm_kcalloc()/devm_kfree(), kcalloc()/kfree()
is enough.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://msgid.link/r/d16f22ae0627249a9fc658927832590cd88c544e.1702960856.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 55d7bbe4

sound/soc/sprd/sprd-pcm-compress.c

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, 
		return -ENODEV;

	}



	sgt = sg = devm_kcalloc(dev, sg_num, sizeof(*sg), GFP_KERNEL);

	sgt = sg = kcalloc(sg_num, sizeof(*sg), GFP_KERNEL);

	if (!sg) {

		ret = -ENOMEM;

		goto sg_err;
@@ -250,12 +250,12 @@ static int sprd_platform_compr_dma_config(struct snd_soc_component *component, 
		dma->desc->callback_param = cstream;

	}



	devm_kfree(dev, sg);

	kfree(sg);



	return 0;



config_err:

	devm_kfree(dev, sg);

	kfree(sg);

sg_err:

	dma_release_channel(dma->chan);

	return ret;