lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()

Browse Source 
A slight cleanup of timeout check in azx_get_response() to check
jiffies for HZ-independent timeout.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai
2006-09-21 13:34:13 +02:00
committed by Jaroslav Kysela
parent 314634bc81
commit 5c79b1f887
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sound/pci/hda/hda_intel.c
View File

@@ -520,27 +520,29 @@ static void azx_update_rirb(struct azx *chip)
static unsigned int azx_rirb_get_response(struct hda_codec *codec) static unsigned int azx_rirb_get_response(struct hda_codec *codec)
{ {
struct azx *chip = codec->bus->private_data; struct azx *chip = codec->bus->private_data;
int timeout = 50; unsigned long timeout;
for (;;) { again:
timeout = jiffies + msecs_to_jiffies(1000);
do {
if (chip->polling_mode) { if (chip->polling_mode) {
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
azx_update_rirb(chip); azx_update_rirb(chip);
spin_unlock_irq(&chip->reg_lock); spin_unlock_irq(&chip->reg_lock);
} }
if (! chip->rirb.cmds) if (! chip->rirb.cmds)
break; return chip->rirb.res; /* the last value */
if (! --timeout) { schedule_timeout_interruptible(1);
if (! chip->polling_mode) { } while (time_after_eq(timeout, jiffies));
snd_printk(KERN_WARNING "hda_intel: "
"azx_get_response timeout, " if (!chip->polling_mode) {
snd_printk(KERN_WARNING "hda_intel: azx_get_response timeout, "
"switching to polling mode...\n"); "switching to polling mode...\n");
chip->polling_mode = 1; chip->polling_mode = 1;
timeout = 50; goto again;
continue;
} }
snd_printk(KERN_ERR
"hda_intel: azx_get_response timeout, " snd_printk(KERN_ERR "hda_intel: azx_get_response timeout, "
"switching to single_cmd mode...\n"); "switching to single_cmd mode...\n");
chip->rirb.rp = azx_readb(chip, RIRBWP); chip->rirb.rp = azx_readb(chip, RIRBWP);
chip->rirb.cmds = 0; chip->rirb.cmds = 0;
@@ -548,10 +550,6 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
chip->single_cmd = 1; chip->single_cmd = 1;
azx_free_cmd_io(chip); azx_free_cmd_io(chip);
return -1; return -1;
}
msleep(1);
}
return chip->rirb.res; /* the last value */
} }
/* /*