* [PATCH] ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
@ 2011-09-23 5:23 Axel Lin
2011-09-23 10:54 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2011-09-23 5:23 UTC (permalink / raw)
To: linux-kernel; +Cc: Mark Brown, Liam Girdwood, alsa-devel
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm5100.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 576081a..58f043c 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2418,6 +2418,8 @@ static int wm5100_probe(struct snd_soc_codec *codec)
return 0;
err_gpio:
+ if (i2c->irq)
+ free_irq(i2c->irq, codec);
wm5100_free_gpio(codec);
err_reset:
if (wm5100->pdata.reset) {
@@ -2444,11 +2446,14 @@ err_core:
static int wm5100_remove(struct snd_soc_codec *codec)
{
struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
+ struct i2c_client *i2c = to_i2c_client(codec->dev);
wm5100_set_bias_level(codec, SND_SOC_BIAS_OFF);
if (wm5100->pdata.hp_pol) {
gpio_free(wm5100->pdata.hp_pol);
}
+ if (i2c->irq)
+ free_irq(i2c->irq, codec);
wm5100_free_gpio(codec);
if (wm5100->pdata.reset) {
gpio_set_value_cansleep(wm5100->pdata.reset, 1);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
2011-09-23 5:23 [PATCH] ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path Axel Lin
@ 2011-09-23 10:54 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-09-23 10:54 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Liam Girdwood, alsa-devel
On Fri, Sep 23, 2011 at 01:23:10PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
@ 2011-09-23 10:54 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-09-23 10:54 UTC (permalink / raw)
To: Axel Lin; +Cc: alsa-devel, linux-kernel, Liam Girdwood
On Fri, Sep 23, 2011 at 01:23:10PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-23 10:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-23 5:23 [PATCH] ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path Axel Lin
2011-09-23 10:54 ` Mark Brown
2011-09-23 10:54 ` 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.