releases/3.1.1/asoc-ensure-we-always-delay-for-wm8962-fll-when-starting-from-sysclk.patch

   1 From 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc Mon Sep 17 00:00:00 2001
   2 From: Mark Brown <broonie@opensource.wolfsonmicro.com>
   3 Date: Tue, 1 Nov 2011 13:53:54 +0000
   4 Subject: ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
   5
   6 From: Mark Brown <broonie@opensource.wolfsonmicro.com>
   7
   8 commit 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc upstream.
   9
  10 Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  11 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  12
  13 ---
  14  sound/soc/codecs/wm8962.c |   15 +++++++--------
  15  1 file changed, 7 insertions(+), 8 deletions(-)
  16
  17 --- a/sound/soc/codecs/wm8962.c
  18 +++ b/sound/soc/codecs/wm8962.c
  19 @@ -2233,15 +2233,14 @@ static int sysclk_event(struct snd_soc_d
  20
  21                         snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
  22                                             WM8962_FLL_ENA, WM8962_FLL_ENA);
  23 -                       if (wm8962->irq) {
  24 -                               timeout = msecs_to_jiffies(5);
  25 -                               timeout = wait_for_completion_timeout(&wm8962->fll_lock,
  26 -                                                                     timeout);
  27
  28 -                               if (timeout == 0)
  29 -                                       dev_err(codec->dev,
  30 -                                               "Timed out starting FLL\n");
  31 -                       }
  32 +                       timeout = msecs_to_jiffies(5);
  33 +                       timeout = wait_for_completion_timeout(&wm8962->fll_lock,
  34 +                                                             timeout);
  35 +
  36 +                       if (wm8962->irq && timeout == 0)
  37 +                               dev_err(codec->dev,
  38 +                                       "Timed out starting FLL\n");
  39                 }
  40                 break;
  41