From 435693ed70b4926625925d412db0a59f04dc26b2 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 3 Mar 2012 18:46:36 +0000 Subject: [PATCH] --- yaml --- r: 293441 b: refs/heads/master c: afaf1591203e4ea12c4c8e0240549ff5e592d7ae h: refs/heads/master i: 293439: fdd2721b299897b293a5c4a127ac2c805246be3e v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8994.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fb55c5739b62..1049e5d478e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d464b201fd2f82902028437314a10db85e48ed8 +refs/heads/master: afaf1591203e4ea12c4c8e0240549ff5e592d7ae diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c index 17baacbcf2f5..6166a5783410 100644 --- a/trunk/sound/soc/codecs/wm8994.c +++ b/trunk/sound/soc/codecs/wm8994.c @@ -3376,6 +3376,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, } else { snd_soc_update_bits(codec, WM8958_MIC_DETECT_1, WM8958_MICD_ENA, 0); + wm1811_jackdet_set_mode(codec, WM1811_JACKDET_MODE_NONE); snd_soc_dapm_disable_pin(&codec->dapm, "CLK_SYS"); snd_soc_dapm_sync(&codec->dapm); }