From 487fb7dcc47efc79bea889963d52a79aa788df5d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 22 Mar 2010 13:48:36 +0000 Subject: [PATCH] --- yaml --- r: 193369 b: refs/heads/master c: 2f14430af52fff08ed1987a3cee612e133a6b82f h: refs/heads/master i: 193367: 3b27b0e76db8f3798a547679ec7d4ce983a687f1 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8350.c | 2 -- trunk/sound/soc/imx/wm1133-ev1.c | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fae90e0eda2..4454d53d82ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b9e87ccccf77f46c006c2cf0988a66d0f3f310d +refs/heads/master: 2f14430af52fff08ed1987a3cee612e133a6b82f diff --git a/trunk/sound/soc/codecs/wm8350.c b/trunk/sound/soc/codecs/wm8350.c index ff6c10155ee6..fb1005edee79 100644 --- a/trunk/sound/soc/codecs/wm8350.c +++ b/trunk/sound/soc/codecs/wm8350.c @@ -1475,8 +1475,6 @@ int wm8350_mic_jack_detect(struct snd_soc_codec *codec, wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA); wm8350_set_bits(wm8350, WM8350_POWER_MGMT_1, WM8350_MIC_DET_ENA); - snd_soc_dapm_force_enable_pin(codec, "Mic Bias"); - return 0; } EXPORT_SYMBOL_GPL(wm8350_mic_jack_detect); diff --git a/trunk/sound/soc/imx/wm1133-ev1.c b/trunk/sound/soc/imx/wm1133-ev1.c index cec8bae7ac18..a6e7d9497639 100644 --- a/trunk/sound/soc/imx/wm1133-ev1.c +++ b/trunk/sound/soc/imx/wm1133-ev1.c @@ -234,6 +234,8 @@ static int wm1133_ev1_init(struct snd_soc_codec *codec) wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, SND_JACK_BTN_0); + snd_soc_dapm_force_enable_pin(codec, "Mic Bias"); + return 0; }