From 5a8d2baceb7a701bcfe02bf9e6f2620a3f3c70bd Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 1 Nov 2011 16:02:01 +0000 Subject: [PATCH] --- yaml --- r: 283677 b: refs/heads/master c: 00ae3b8691e6486895d92de05d7d1d3a70bb5077 h: refs/heads/master i: 283675: 5a379764872a83a781eb2270ea6cb56ae267d1c2 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8962.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d98038901419..0360c8e0f047 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5ef9884088de4ed87ee9490923f277e805b38b2 +refs/heads/master: 00ae3b8691e6486895d92de05d7d1d3a70bb5077 diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c index b9c64a826ff6..cf7df9e61ef3 100644 --- a/trunk/sound/soc/codecs/wm8962.c +++ b/trunk/sound/soc/codecs/wm8962.c @@ -3664,6 +3664,9 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) if (jack) { snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK"); snd_soc_dapm_force_enable_pin(&codec->dapm, "MICBIAS"); + } else { + snd_soc_dapm_disable_pin(&codec->dapm, "SYSCLK"); + snd_soc_dapm_disable_pin(&codec->dapm, "MICBIAS"); } return 0;