diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 13:53:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:44:29 -0800 |
| commit | 3911ea7beedc6fbcce9235bda520749a6dfd4c57 (patch) | |
| tree | 67cd13abb8d3b71d6d5c600166afa54182ce90e8 /sound | |
| parent | 5b8cf7c773f0b2a48e7d546acd5edf054e51d286 (diff) | |
| download | lwn-3911ea7beedc6fbcce9235bda520749a6dfd4c57.tar.gz lwn-3911ea7beedc6fbcce9235bda520749a6dfd4c57.zip | |
ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
commit 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc upstream.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index c0cdd6bdca64..c61067530908 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -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; |