diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 15:00:08 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 15:00:08 +0200 |
| commit | fef24d92a649ba1415c0a834259048153a2ab30a (patch) | |
| tree | 6530bae4e72ce16de600fee8e9f602fa96f9be2b /sound/soc/codecs/wm8962.c | |
| parent | ASoC: Provide more detail on WM8962 thermal shutdown status (diff) | |
| parent | ASoC: Clear completions from late WM8996 FLL lock IRQs (diff) | |
| download | linux-fef24d92a649ba1415c0a834259048153a2ab30a.tar.xz linux-fef24d92a649ba1415c0a834259048153a2ab30a.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 382c8779e605..8e397b286aa3 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2354,6 +2354,8 @@ static int sysclk_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: if (fll) { + try_wait_for_completion(&wm8962->fll_lock); + snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_ENA, WM8962_FLL_ENA); if (wm8962->irq) { @@ -3449,6 +3451,8 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, snd_soc_write(codec, WM8962_FLL_CONTROL_7, fll_div.lambda); snd_soc_write(codec, WM8962_FLL_CONTROL_8, fll_div.n); + try_wait_for_completion(&wm8962->fll_lock); + snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK | WM8962_FLL_ENA, fll1); |