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

Commit 1b8b68b0 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()' 



All error handling paths in this function 'goto err' except this one.

If one of the 2 previous memory allocations fails, we should go through
the existing error handling path. Otherwise there is an unbalanced
pm_runtime_enable()/pm_runtime_disable().

Fixes: dd55ff83 ("ASoC: davinci-mcasp: Add set_tdm_slots() support")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2bd6bf03

sound/soc/davinci/davinci-mcasp.c

+4 −2
Original line number Diff line number Diff line
@@ -1982,8 +1982,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
			     GFP_KERNEL);



	if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list ||

	    !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list)

		return -ENOMEM;

	    !mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list) {

		ret = -ENOMEM;

		goto err;

	}



	ret = davinci_mcasp_set_ch_constraints(mcasp);

	if (ret)