Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1733212

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

Show all headers | View raw

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: dd55ff8346a9 ("ASoC: davinci-mcasp: Add set_tdm_slots() support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 sound/soc/davinci/davinci-mcasp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index f395bbc7c354..23b0da7df1f2 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -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)
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-16 07:50 +0200
  Re: [PATCH] ASoC: davinci-mcasp: Fix an error handling path in  'davinci_mcasp_probe()' Peter Ujfalusi <peter.ujfalusi@ti.com> - 2017-09-19 08:20 +0200
  Applied "ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()'" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-09-19 15:50 +0200

csiph-web