| From 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Date: Tue, 1 Nov 2011 13:53:54 +0000 |
| Subject: ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK |
| |
| From: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| |
| commit 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc upstream. |
| |
| Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/soc/codecs/wm8962.c | 15 +++++++-------- |
| 1 file changed, 7 insertions(+), 8 deletions(-) |
| |
| --- a/sound/soc/codecs/wm8962.c |
| +++ b/sound/soc/codecs/wm8962.c |
| @@ -2233,15 +2233,14 @@ static int sysclk_event(struct snd_soc_d |
| |
| 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; |
| |
