aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-03 13:46:06 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-03 20:57:37 -0500
commit7d464b201fd2f82902028437314a10db85e48ed8 (patch)
treeaccd6253eb91b88e3abef766bb5de154f3a1f946
parent67109cbea1f92d369849dc88b6c9aca0f66c044e (diff)
ASoC: wm8994: Make sure we sync DAPM on WM8958 detection mode changes
Normally this will have no effect as we set detection up at system startup before DAPM syncs take effect, this will only be useful if the system enables and disables detection at runtime. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1fef87d6a285..17baacbcf2f5 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3330,6 +3330,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
3330 } 3330 }
3331 3331
3332 snd_soc_dapm_force_enable_pin(&codec->dapm, "CLK_SYS"); 3332 snd_soc_dapm_force_enable_pin(&codec->dapm, "CLK_SYS");
3333 snd_soc_dapm_sync(&codec->dapm);
3333 3334
3334 wm8994->micdet[0].jack = jack; 3335 wm8994->micdet[0].jack = jack;
3335 wm8994->jack_cb = cb; 3336 wm8994->jack_cb = cb;
@@ -3376,6 +3377,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
3376 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1, 3377 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,
3377 WM8958_MICD_ENA, 0); 3378 WM8958_MICD_ENA, 0);
3378 snd_soc_dapm_disable_pin(&codec->dapm, "CLK_SYS"); 3379 snd_soc_dapm_disable_pin(&codec->dapm, "CLK_SYS");
3380 snd_soc_dapm_sync(&codec->dapm);
3379 } 3381 }
3380 3382
3381 return 0; 3383 return 0;