From 0fe822ea7d089924b910b678b7bffa5cf9fdad97 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 18 Jul 2012 19:11:30 +0100
Subject: [PATCH] --- yaml --- r: 316319 b: refs/heads/master c:
 b4046d013b5b9a7cab835def403f7f421cdf0cb6 h: refs/heads/master i:   316317:
 c15052deee642dac869f608facb1ff926a813cca   316315:
 e2ab7d9bb3b2f41928eca848ed4bfeb66e3f150f   316311:
 afbf750f42b717c724e652b3c55b5c5777b8c38e   316303:
 1623d088e4902dcf525dc61080e5b8c20a47c371   316287:
 e3ee2f9e4493e418184523844e7197e6bf9ab119 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8994.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 516fba82c6f2..0150c68dd546 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 601787c232306e0bb84fff9fc7c2be5a5c7b87a0
+refs/heads/master: b4046d013b5b9a7cab835def403f7f421cdf0cb6
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
index 7bb875230dc0..65763388649c 100644
--- a/trunk/sound/soc/codecs/wm8994.c
+++ b/trunk/sound/soc/codecs/wm8994.c
@@ -3695,9 +3695,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
 	if (wm8994->pdata && wm8994->pdata->micdet_irq)
 		wm8994->micdet_irq = wm8994->pdata->micdet_irq;
-	else if (wm8994->pdata && wm8994->pdata->irq_base)
-		wm8994->micdet_irq = wm8994->pdata->irq_base +
-				     WM8994_IRQ_MIC1_DET;
 
 	pm_runtime_enable(codec->dev);
 	pm_runtime_idle(codec->dev);
@@ -3836,6 +3833,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 				dev_warn(codec->dev,
 					 "Failed to request Mic detect IRQ: %d\n",
 					 ret);
+		} else {
+			wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_MIC1_DET,
+					   wm8958_mic_irq, "Mic detect",
+					   wm8994);
 		}
 	}