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>
git-mirror · Jan 24, 2012 · e8770dd · e8770dd
1 parent 05d448e
commit e8770dd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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;
 }