Skip to contentSkip to conversation

ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path

PATCH Applied Axel Lin 2 participants 2 messages Sep 23, 2011

Subsystems (3)
Sound ASoC Wolfson microelectronics drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path

Signed-off-by Axel Lin <[email protected]>
---
 sound/soc/codecs/wm5100.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
sound/soc/codecs/wm5100.c +5 -0
index 576081a..58f043c 100644
@@ -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);
Signature · 1 line
1.7.4.1