ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK

commit 0b7dd6ad92 upstream.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Brown
2011-11-01 13:53:54 +00:00
committed by Greg Kroah-Hartman
parent 5b8cf7c773
commit 3911ea7bee

View File

@@ -2233,15 +2233,14 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
WM8962_FLL_ENA, WM8962_FLL_ENA);
if (wm8962->irq) {
timeout = msecs_to_jiffies(5);
timeout = wait_for_completion_timeout(&wm8962->fll_lock,
timeout);
if (timeout == 0)
dev_err(codec->dev,
"Timed out starting FLL\n");
}
timeout = msecs_to_jiffies(5);
timeout = wait_for_completion_timeout(&wm8962->fll_lock,
timeout);
if (wm8962->irq && timeout == 0)
dev_err(codec->dev,
"Timed out starting FLL\n");
}
break;