From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 24 Jan 2012 12:11:20 +0000 (+0000)
Subject: ASoC: wm5100: Fix mismerge of IRQ frees
X-Git-Tag: v3.4-rc1~88^2^2~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e8770dd878970140b7ef486ec0fe86d43eb50265;p=karo-tx-linux.git

ASoC: wm5100: Fix mismerge of IRQ frees

We only want them at the device level, not at the CODEC level.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index c291f8ea32e9..81056d8dc89e 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2525,8 +2525,6 @@ static int wm5100_probe(struct snd_soc_codec *codec)
 	return 0;
 
 err_gpio:
-	if (i2c->irq)
-		free_irq(i2c->irq, wm5100);
 
 	return ret;
 }
@@ -2539,8 +2537,6 @@ static int wm5100_remove(struct snd_soc_codec *codec)
 	if (wm5100->pdata.hp_pol) {
 		gpio_free(wm5100->pdata.hp_pol);
 	}
-	if (i2c->irq)
-		free_irq(i2c->irq, wm5100);
 
 	return 0;
 }