From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 15 Jul 2011 18:12:18 +0000 (+0900)
Subject: ASoC: Handle failed WM8994 FLL lock waits
X-Git-Tag: v3.1-rc1~87^2^2~17
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1;p=cascardo%2Flinux.git

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>
---

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)