summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 79d63c99f092..ce75e07aaa2a 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -332,6 +332,7 @@ struct azx {
int position_fix;
unsigned int initialized: 1;
unsigned int single_cmd: 1;
+ unsigned int polling_mode: 1;
};
/* driver types */
@@ -518,8 +519,23 @@ static unsigned int azx_rirb_get_response(struct hda_codec *codec)
struct azx *chip = codec->bus->private_data;
int timeout = 50;
- while (chip->rirb.cmds) {
+ for (;;) {
+ if (chip->polling_mode) {
+ spin_lock_irq(&chip->reg_lock);
+ azx_update_rirb(chip);
+ spin_unlock_irq(&chip->reg_lock);
+ }
+ if (! chip->rirb.cmds)
+ break;
if (! --timeout) {
+ if (! chip->polling_mode) {
+ snd_printk(KERN_WARNING "hda_intel: "
+ "azx_get_response timeout, "
+ "switching to polling mode...\n");
+ chip->polling_mode = 1;
+ timeout = 50;
+ continue;
+ }
snd_printk(KERN_ERR
"hda_intel: azx_get_response timeout, "
"switching to single_cmd mode...\n");