summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-01-18 15:32:32 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:30:05 +0100
commit28a0d9df0706c523d3bb8de18892c76b78c2e428 (patch)
tree0bc6757b150a8350a419fd6dd5b884bd53d410ee /sound
parent7cda8ba9f4e471dfba914ecf67fd14ebffb17c16 (diff)
downloadop-kernel-dev-28a0d9df0706c523d3bb8de18892c76b78c2e428.zip
op-kernel-dev-28a0d9df0706c523d3bb8de18892c76b78c2e428.tar.gz
[ALSA] hda-intel - Make azx_get_response() a bit more robust
In azx_[rirb_]get_response(), the timeout is checked at the end of the loop. It's better to be checked just after the check of the RIRB index to avoid a bogus error with a too long msleep(). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index fe07bdf..be5cbbc 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -551,7 +551,7 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
again:
timeout = jiffies + msecs_to_jiffies(1000);
- do {
+ for (;;) {
if (chip->polling_mode) {
spin_lock_irq(&chip->reg_lock);
azx_update_rirb(chip);
@@ -559,13 +559,15 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
}
if (!chip->rirb.cmds)
return chip->rirb.res; /* the last value */
+ if (time_after(jiffies, timeout))
+ break;
if (codec->bus->needs_damn_long_delay)
msleep(2); /* temporary workaround */
else {
udelay(10);
cond_resched();
}
- } while (time_after_eq(timeout, jiffies));
+ }
if (chip->msi) {
snd_printk(KERN_WARNING "hda_intel: No response from codec, "
OpenPOWER on IntegriCloud