]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: Clear completions from late WM8996 FLL lock IRQs
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 16 Aug 2011 07:57:58 +0000 (16:57 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Aug 2011 12:57:35 +0000 (13:57 +0100)
In case we have a pending completion, for example due to a problem with
the input clock which got corrected after we timed out.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
sound/soc/codecs/wm8996.c

index e76d4edb67b2a7d44f50aa79a03cca964b072b02..0936ae5e3749de1d511dd8c8f260962d004bcc1a 100644 (file)
@@ -2111,6 +2111,9 @@ static int wm8996_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
 
        snd_soc_write(codec, WM8996_FLL_EFS_1, fll_div.lambda);
 
+       /* Clear any pending completions (eg, from failed startups) */
+       try_wait_for_completion(&wm8996->fll_lock);
+
        snd_soc_update_bits(codec, WM8996_FLL_CONTROL_1,
                            WM8996_FLL_ENA, WM8996_FLL_ENA);