diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-15 17:33:26 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-15 23:48:05 +0900 |
| commit | 1479c3fb5f0ca8410428006cb04ca27263beea25 (patch) | |
| tree | 7367a0648f4ce09c9d8827de9e511e2b662ad8e7 /sound | |
| parent | 6b3860b0a20a790fb26ca67aadcba0714e879667 (diff) | |
| download | linux-1479c3fb5f0ca8410428006cb04ca27263beea25.tar.gz | |
ASoC: Handle spurious wm_hubs DC servo done interrupts
Don't assume the first fire indicates that we're done. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 5c2d5657b472..4cc2d567f22f 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -66,8 +66,8 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); unsigned int reg; int count = 0; + int timeout; unsigned int val; - unsigned long timeout; val = op | WM8993_DCS_ENA_CHAN_0 | WM8993_DCS_ENA_CHAN_1; @@ -76,21 +76,23 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) dev_dbg(codec->dev, "Waiting for DC servo...\n"); - if (hubs->dcs_done_irq) { - timeout = wait_for_completion_timeout(&hubs->dcs_done, - msecs_to_jiffies(500)); - if (timeout == 0) - dev_warn(codec->dev, "No DC servo interrupt\n"); + if (hubs->dcs_done_irq) + timeout = 4; + else + timeout = 400; - reg = snd_soc_read(codec, WM8993_DC_SERVO_0); - } else { - do { - count++; + do { + count++; + + if (hubs->dcs_done_irq) + wait_for_completion_timeout(&hubs->dcs_done, + msecs_to_jiffies(250)); + else msleep(1); - reg = snd_soc_read(codec, WM8993_DC_SERVO_0); - dev_dbg(codec->dev, "DC servo: %x\n", reg); - } while (reg & op && count < 400); - } + + reg = snd_soc_read(codec, WM8993_DC_SERVO_0); + dev_dbg(codec->dev, "DC servo: %x\n", reg); + } while (reg & op && count < timeout); if (reg & op) dev_err(codec->dev, "Timed out waiting for DC Servo %x\n", |