All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'
@ 2017-08-31  4:40 ` Christophe JAILLET
  0 siblings, 0 replies; 55+ messages in thread
From: Christophe JAILLET @ 2017-08-31  4:40 UTC (permalink / raw)
  To: perex, tiwai, arvind.yadav.cs, nicolas.ferre, broonie, garsilva,
	andriy.shevchenko, bhumirks
  Cc: alsa-devel, linux-kernel, kernel-janitors, Christophe JAILLET

If 'clk_prepare_enable()' fails, we must release some resources before
returning. Add a new label in the existing error handling path and 'goto'
there.

Fixes: 260ea95cc027 ("ASoC: atmel: ac97c: Handle return value of clk_prepare_enable.")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 sound/atmel/ac97c.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 30c64ab210d9..5ffefac2fa8f 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -785,7 +785,7 @@ static int atmel_ac97c_probe(struct platform_device *pdev)
 	}
 	retval = clk_prepare_enable(pclk);
 	if (retval)
-		return retval;
+		goto err_prepare_enable;
 
 	retval = snd_card_new(&pdev->dev, SNDRV_DEFAULT_IDX1,
 			      SNDRV_DEFAULT_STR1, THIS_MODULE,
@@ -881,6 +881,7 @@ static int atmel_ac97c_probe(struct platform_device *pdev)
 	snd_card_free(card);
 err_snd_card_new:
 	clk_disable_unprepare(pclk);
+err_prepare_enable:
 	clk_put(pclk);
 	return retval;
 }
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 55+ messages in thread

end of thread, other threads:[~2017-08-31 21:07 UTC | newest]

Thread overview: 55+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-31  4:40 [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Christophe JAILLET
2017-08-31  4:40 ` Christophe JAILLET
2017-08-31  4:40 ` Christophe JAILLET
2017-08-31  8:10 ` [alsa-devel] " Alexandre Belloni
2017-08-31  8:10   ` Alexandre Belloni
2017-08-31  8:10   ` [alsa-devel] " Alexandre Belloni
2017-08-31  8:23   ` Julia Lawall
2017-08-31  8:23     ` Julia Lawall
2017-08-31  8:23     ` [alsa-devel] " Julia Lawall
2017-08-31  9:04     ` Andy Shevchenko
2017-08-31  9:04       ` Andy Shevchenko
2017-08-31  9:04       ` [alsa-devel] " Andy Shevchenko
2017-08-31  9:35       ` Alexandre Belloni
2017-08-31  9:35         ` Alexandre Belloni
2017-08-31  9:38         ` Andy Shevchenko
2017-08-31  9:38           ` Andy Shevchenko
2017-08-31  9:57           ` Alexandre Belloni
2017-08-31  9:57             ` Alexandre Belloni
2017-08-31  9:57             ` [alsa-devel] " Alexandre Belloni
2017-08-31  9:56     ` Alexandre Belloni
2017-08-31  9:56       ` Alexandre Belloni
2017-08-31  9:56       ` [alsa-devel] " Alexandre Belloni
2017-08-31 10:13       ` Takashi Iwai
2017-08-31 10:13         ` Takashi Iwai
2017-08-31 10:13         ` [alsa-devel] " Takashi Iwai
2017-08-31 10:19         ` Alexandre Belloni
2017-08-31 10:19           ` Alexandre Belloni
2017-08-31 10:23         ` Takashi Iwai
2017-08-31 10:23           ` Takashi Iwai
2017-08-31 10:23           ` Takashi Iwai
2017-08-31 10:37           ` Mark Brown
2017-08-31 10:37             ` Mark Brown
2017-08-31 10:37             ` [alsa-devel] " Mark Brown
2017-08-31 10:49             ` Takashi Iwai
2017-08-31 10:49               ` Takashi Iwai
2017-08-31 10:19   ` Mark Brown
2017-08-31 10:19     ` Mark Brown
2017-08-31 10:19     ` [alsa-devel] " Mark Brown
2017-08-31 10:31     ` Takashi Iwai
2017-08-31 10:31       ` Takashi Iwai
2017-08-31 10:31       ` [alsa-devel] " Takashi Iwai
2017-08-31 10:38       ` Mark Brown
2017-08-31 10:38         ` Mark Brown
2017-08-31 10:38         ` [alsa-devel] " Mark Brown
2017-08-31 19:08         ` Christophe JAILLET
2017-08-31 19:08           ` Christophe JAILLET
2017-08-31 19:08           ` Christophe JAILLET
2017-08-31 20:50           ` Alexandre Belloni
2017-08-31 20:50             ` Alexandre Belloni
2017-08-31 21:07             ` Julia Lawall
2017-08-31 21:07               ` Julia Lawall
2017-08-31 21:07               ` Julia Lawall
2017-08-31 11:55 ` Applied "ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'" to the asoc tree Mark Brown
2017-08-31 11:55   ` Mark Brown
2017-08-31 11:55   ` Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.