On Thu, 2011-09-15 at 10:54 +0100, Mark Brown wrote:
We need to count the timneout down.
Reported-by: Axel Lin axel.lin@gmail.com Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/codecs/wm8996.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 0fed436..5ca9d76 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -719,7 +719,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask) { struct i2c_client *i2c = to_i2c_client(codec->dev); struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
- int i, ret;
int ret; unsigned long timeout = 200;
snd_soc_write(codec, WM8996_DC_SERVO_2, mask);
@@ -734,15 +734,12 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask)
} else { msleep(1);
if (--i) {timeout = 0;break;}
timeout--;}
ret = snd_soc_read(codec, WM8996_DC_SERVO_2); dev_dbg(codec->dev, "DC servo state: %x\n", ret);
- } while (ret & mask);
} while (timeout && ret & mask);
if (timeout == 0) dev_err(codec->dev, "DC servo timed out for %x\n", mask);
Acked-by: Liam Girdwood lrg@ti.com