diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 13:53:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-01 18:52:05 +0000 |
| commit | 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc (patch) | |
| tree | 48c836312b516daefa6c1e9b203c70f83c54b250 /sound/soc | |
| parent | 2af8de8c39cf58e5a5e40a9d5d71332da98e6ba7 (diff) | |
| download | linux-0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc.tar.gz linux-0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc.tar.bz2 linux-0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc.zip | |
ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound/soc')
| -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 a0c895b2d53b..91d3c6dbeba3 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2366,15 +2366,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; |