diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-24 13:11:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-24 13:11:20 +0100 |
| commit | e8770dd878970140b7ef486ec0fe86d43eb50265 (patch) | |
| tree | 1c3cb5498550078523813e7f078b3bb74acff690 /sound/soc/codecs/wm5100.c | |
| parent | ASoC: Convert WM8731 to direct regmap API usage (diff) | |
| download | linux-e8770dd878970140b7ef486ec0fe86d43eb50265.tar.xz linux-e8770dd878970140b7ef486ec0fe86d43eb50265.zip | |
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 '')
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 4 |
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) 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; } |