aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm5100.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-24 07:11:20 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-24 07:11:20 -0500
commite8770dd878970140b7ef486ec0fe86d43eb50265 (patch)
tree1c3cb5498550078523813e7f078b3bb74acff690 /sound/soc/codecs/wm5100.c
parent05d448e2c9bc587216549d690332c72a74271abd (diff)
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>
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
-rw-r--r--sound/soc/codecs/wm5100.c4
1 files changed, 0 insertions, 4 deletions
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)
2525 return 0; 2525 return 0;
2526 2526
2527err_gpio: 2527err_gpio:
2528 if (i2c->irq)
2529 free_irq(i2c->irq, wm5100);
2530 2528
2531 return ret; 2529 return ret;
2532} 2530}
@@ -2539,8 +2537,6 @@ static int wm5100_remove(struct snd_soc_codec *codec)
2539 if (wm5100->pdata.hp_pol) { 2537 if (wm5100->pdata.hp_pol) {
2540 gpio_free(wm5100->pdata.hp_pol); 2538 gpio_free(wm5100->pdata.hp_pol);
2541 } 2539 }
2542 if (i2c->irq)
2543 free_irq(i2c->irq, wm5100);
2544 2540
2545 return 0; 2541 return 0;
2546} 2542}