aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-01 07:43:26 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-01 09:21:58 -0500
commit52ac7ab2475da2b577e4a4616c98b5d1fa3a3cfd (patch)
tree2e4c0f5238b45715cead109ceb422724b5beb385 /sound
parentaf6b6fe41c4bc9e7933d66bbbf5106e0e7e6e484 (diff)
ASoC: Ensure we reconfigure WM8958 microphone detection on rate changes
We don't need to rerun DAPM if the clock source is the same but we do need to adjust the microphone detection rate in case we are moving from an audio to a non-audio rate. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 2e28f472b963..91f3638ab33f 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -307,10 +307,8 @@ static int configure_clock(struct snd_soc_codec *codec)
307 307
308 change = snd_soc_update_bits(codec, WM8994_CLOCKING_1, 308 change = snd_soc_update_bits(codec, WM8994_CLOCKING_1,
309 WM8994_SYSCLK_SRC, new); 309 WM8994_SYSCLK_SRC, new);
310 if (!change) 310 if (change)
311 return 0; 311 snd_soc_dapm_sync(&codec->dapm);
312
313 snd_soc_dapm_sync(&codec->dapm);
314 312
315 wm8958_micd_set_rate(codec); 313 wm8958_micd_set_rate(codec);
316 314