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


Groups > linux.kernel > #1723809

[PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'

From Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups linux.kernel
Subject [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'
Date 2017-08-31 06:50 +0200
Message-ID <ukpAt-12h-1@gated-at.bofh.it> (permalink)
Organization linux.* mail to news gateway

Show all headers | View raw


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

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


Thread

[PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-31 06:50 +0200
  Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 10:20 +0200
    Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Julia Lawall <julia.lawall@lip6.fr> - 2017-08-31 10:30 +0200
      Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-08-31 11:10 +0200
        Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-08-31 11:40 +0200
          Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 12:00 +0200
        Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 11:40 +0200
      Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 12:00 +0200
        Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Takashi Iwai <tiwai@suse.de> - 2017-08-31 12:20 +0200
          Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Takashi Iwai <tiwai@suse.de> - 2017-08-31 12:30 +0200
            Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Mark Brown <broonie@kernel.org> - 2017-08-31 12:40 +0200
              Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Takashi Iwai <tiwai@suse.de> - 2017-08-31 12:50 +0200
          Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 12:30 +0200
    Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Mark Brown <broonie@kernel.org> - 2017-08-31 12:20 +0200
      Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()' Takashi Iwai <tiwai@suse.de> - 2017-08-31 12:40 +0200
        Re: [alsa-devel] [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Mark Brown <broonie@kernel.org> - 2017-08-31 12:40 +0200
          Re: [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-31 21:10 +0200
            Re: [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-08-31 23:00 +0200
              Re: [PATCH] ALSA: ac97c: Fix an error handling path in  'atmel_ac97c_probe()' Julia Lawall <julia.lawall@lip6.fr> - 2017-08-31 23:10 +0200
  Applied "ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-08-31 14:00 +0200

csiph-web