Skip to content

Commit

Permalink
ASoC: wm8962: Unconditionally wait for the FLL to lock
Browse files Browse the repository at this point in the history
If the FLL is being shut down we will exit early so there is no need to
check here and in fact we're checking the wrong thing anyway.

Reported-by: Graeme Gregory <gg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Dec 24, 2012
1 parent a2ce647 commit 346f1d4
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -2873,22 +2873,20 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,

ret = 0;

if (fll1 & WM8962_FLL_ENA) {
/* This should be a massive overestimate but go even
* higher if we'll error out
*/
if (wm8962->irq)
timeout = msecs_to_jiffies(5);
else
timeout = msecs_to_jiffies(1);
/* This should be a massive overestimate but go even
* higher if we'll error out
*/
if (wm8962->irq)
timeout = msecs_to_jiffies(5);
else
timeout = msecs_to_jiffies(1);

timeout = wait_for_completion_timeout(&wm8962->fll_lock,
timeout);
timeout = wait_for_completion_timeout(&wm8962->fll_lock,
timeout);

if (timeout == 0 && wm8962->irq) {
dev_err(codec->dev, "FLL lock timed out");
ret = -ETIMEDOUT;
}
if (timeout == 0 && wm8962->irq) {
dev_err(codec->dev, "FLL lock timed out");
ret = -ETIMEDOUT;
}

wm8962->fll_fref = Fref;
Expand Down

0 comments on commit 346f1d4

Please sign in to comment.