[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1316755390.3012.5.camel@phoenix>
Date: Fri, 23 Sep 2011 13:23:10 +0800
From: Axel Lin <axel.lin@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Liam Girdwood <lrg@...com>, alsa-devel@...a-project.org
Subject: [PATCH] ASoC: Add missed free_irq in wm5100_remove and
wm5100_probe error path
Signed-off-by: Axel Lin <axel.lin@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists