* [PATCH] ASoC: Fix WM8996 DC servo operation without IRQ
@ 2011-09-15 9:54 Mark Brown
2011-09-15 18:06 ` Liam Girdwood
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2011-09-15 9:54 UTC (permalink / raw)
To: Axel Lin, Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
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);
--
1.7.6.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] ASoC: Fix WM8996 DC servo operation without IRQ
2011-09-15 9:54 [PATCH] ASoC: Fix WM8996 DC servo operation without IRQ Mark Brown
@ 2011-09-15 18:06 ` Liam Girdwood
0 siblings, 0 replies; 2+ messages in thread
From: Liam Girdwood @ 2011-09-15 18:06 UTC (permalink / raw)
To: Mark Brown; +Cc: Axel Lin, patches, alsa-devel
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-15 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-15 9:54 [PATCH] ASoC: Fix WM8996 DC servo operation without IRQ Mark Brown
2011-09-15 18:06 ` Liam Girdwood
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.