summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-03 18:46:36 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-04 01:57:48 +0000
commitafaf1591203e4ea12c4c8e0240549ff5e592d7ae (patch)
treee2aeb2729472a5c2b2ef04bb571a4725387be383 /sound/soc/codecs
parent7d464b201fd2f82902028437314a10db85e48ed8 (diff)
downloadlinux-3.10-afaf1591203e4ea12c4c8e0240549ff5e592d7ae.tar.gz
linux-3.10-afaf1591203e4ea12c4c8e0240549ff5e592d7ae.tar.bz2
linux-3.10-afaf1591203e4ea12c4c8e0240549ff5e592d7ae.zip
ASoC: wm8994: Disable JACKDET when disabling detecton
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8994.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 17baacbcf2f..6166a578341 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/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);
}