iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Fix WM8996 DC servo operation without IRQ

Browse Source 
We need to count the timeout down.

Reported-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2011-09-15 10:52:11 +01:00
parent 7803e329bb
commit f998f257c9
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/codecs/wm8996.c
View File

@ -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 i2c_client *i2c = to_i2c_client(codec->dev);
struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
int i, ret; int ret;
unsigned long timeout = 200; unsigned long timeout = 200;
snd_soc_write(codec, WM8996_DC_SERVO_2, mask); 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 { } else {
msleep(1); msleep(1);
if (--i) { timeout--;
timeout = 0;
break;
}
} }
ret = snd_soc_read(codec, WM8996_DC_SERVO_2); ret = snd_soc_read(codec, WM8996_DC_SERVO_2);
dev_dbg(codec->dev, "DC servo state: %x\n", ret); dev_dbg(codec->dev, "DC servo state: %x\n", ret);
} while (ret & mask); } while (timeout && ret & mask);
if (timeout == 0) if (timeout == 0)
dev_err(codec->dev, "DC servo timed out for %x\n", mask); dev_err(codec->dev, "DC servo timed out for %x\n", mask);