From 3c3d2c09ee11f7fd7b26c3f32425870dd736c75b Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 24 Jan 2012 12:11:20 +0000 Subject: [PATCH] --- yaml --- r: 293226 b: refs/heads/master c: e8770dd878970140b7ef486ec0fe86d43eb50265 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm5100.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dda86e1265ce..5a76b9aba33c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05d448e2c9bc587216549d690332c72a74271abd +refs/heads/master: e8770dd878970140b7ef486ec0fe86d43eb50265 diff --git a/trunk/sound/soc/codecs/wm5100.c b/trunk/sound/soc/codecs/wm5100.c index c291f8ea32e9..81056d8dc89e 100644 --- a/trunk/sound/soc/codecs/wm5100.c +++ b/trunk/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; }