---

yaml
---
r: 316319
b: refs/heads/master
c: b4046d0
h: refs/heads/master
i:
  316317: c15052d
  316315: e2ab7d9
  316311: afbf750
  316303: 1623d08
  316287: e3ee2f9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 601787c232306e0bb84fff9fc7c2be5a5c7b87a0
+refs/heads/master: b4046d013b5b9a7cab835def403f7f421cdf0cb6

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);
 		}
 	}