From 25c35e625c4de7a2f28cc8cb935405dc936cdc38 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 12 Jul 2011 15:47:17 +0900 Subject: [PATCH] --- yaml --- r: 257593 b: refs/heads/master c: b30ead5f391d34c6011e6affe88eb21bb0b9f9dd h: refs/heads/master i: 257591: c65fa743956a9b6bd01a66872ef32102bc12e885 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8994.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c18e83a9bb9f..b2cfc9f01dfa 100644 --- 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 index 3fd7422df408..d2dcaa29c7ca 100644 --- 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)