From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: perex@perex.cz, tiwai@suse.com, arvind.yadav.cs@gmail.com,
nicolas.ferre@microchip.com, broonie@kernel.org,
garsilva@embeddedor.com, andriy.shevchenko@linux.intel.com,
bhumirks@gmail.com
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'
Date: Thu, 31 Aug 2017 06:40:42 +0200 [thread overview]
Message-ID: <20170831044042.23306-1-christophe.jaillet@wanadoo.fr> (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
WARNING: multiple messages have this Message-ID (diff)
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: perex@perex.cz, tiwai@suse.com, arvind.yadav.cs@gmail.com,
nicolas.ferre@microchip.com, broonie@kernel.org,
garsilva@embeddedor.com, andriy.shevchenko@linux.intel.com,
bhumirks@gmail.com
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'
Date: Thu, 31 Aug 2017 04:40:42 +0000 [thread overview]
Message-ID: <20170831044042.23306-1-christophe.jaillet@wanadoo.fr> (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
WARNING: multiple messages have this Message-ID (diff)
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: perex@perex.cz, tiwai@suse.com, arvind.yadav.cs@gmail.com,
nicolas.ferre@microchip.com, broonie@kernel.org,
garsilva@embeddedor.com, andriy.shevchenko@linux.intel.com,
bhumirks@gmail.com
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
alsa-devel@alsa-project.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ALSA: ac97c: Fix an error handling path in 'atmel_ac97c_probe()'
Date: Thu, 31 Aug 2017 06:40:42 +0200 [thread overview]
Message-ID: <20170831044042.23306-1-christophe.jaillet@wanadoo.fr> (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
next reply other threads:[~2017-08-31 4:41 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 4:40 Christophe JAILLET [this message]
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 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170831044042.23306-1-christophe.jaillet@wanadoo.fr \
--to=christophe.jaillet@wanadoo.fr \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arvind.yadav.cs@gmail.com \
--cc=bhumirks@gmail.com \
--cc=broonie@kernel.org \
--cc=garsilva@embeddedor.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.