diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-16 03:12:18 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-17 13:15:00 +0900 |
| commit | f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1 (patch) | |
| tree | ac129fd3a0e51030fd3071396a47ba0acfc8be66 /sound | |
| parent | 1479c3fb5f0ca8410428006cb04ca27263beea25 (diff) | |
| download | lwn-f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1.tar.gz lwn-f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1.zip | |
ASoC: Handle failed WM8994 FLL lock waits
Try the completion before we start the FLL so that if an interrupt was
delayed long enough for us to miss it we don't wait for the completion
it signalled.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index ee64be2d9942..c749ef339665 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1713,6 +1713,9 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, (fll.clk_ref_div << WM8994_FLL1_REFCLK_DIV_SHIFT) | (src - 1)); + /* Clear any pending completion from a previous failure */ + try_wait_for_completion(&wm8994->fll_locked[id]); + /* Enable (with fractional mode if required) */ if (freq_out) { if (fll.k) |