---

yaml --- r: 257593 b: refs/heads/master c: b30ead5 h: refs/heads/master i: 257591: c65fa74 v: v3
git-mirror · Jul 13, 2011 · 25c35e6 · 25c35e6
1 parent b9b881c
commit 25c35e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d96ca3cd0bcefdcd1d9ad1f2610dcd959fccd252
+refs/heads/master: b30ead5f391d34c6011e6affe88eb21bb0b9f9dd
diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c
@@ -2932,6 +2932,12 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 		break;
 	}
 
+	ret = wm8994_request_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
+				 wm_hubs_dcs_done, "DC servo done",
+				 &wm8994->hubs);
+	if (ret == 0)
+		wm8994->hubs.dcs_done_irq = true;
+
 	switch (control->type) {
 	case WM8994:
 		if (wm8994->micdet_irq) {
@@ -3173,6 +3179,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 	wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994);
 	if (wm8994->micdet_irq)
 		free_irq(wm8994->micdet_irq, wm8994);
+	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
+			&wm8994->hubs);
 err:
 	kfree(wm8994);
 	return ret;
@@ -3187,6 +3195,9 @@ static int  wm8994_codec_remove(struct snd_soc_codec *codec)
 
 	pm_runtime_disable(codec->dev);
 
+	wm8994_free_irq(codec->control_data, WM8994_IRQ_DCS_DONE,
+			&wm8994->hubs);
+
 	switch (control->type) {
 	case WM8994:
 		if (wm8994->micdet_irq)