diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-09-08 12:30:03 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 10:47:00 +0200 |
| commit | 43001c9515cf87935c50e84b3e27b1f3b3776b5d (patch) | |
| tree | 295e87add08bfec4a2a4fada76fd1cac7ac0123b /sound/pci | |
| parent | 854b66e44260320c21ebe4b8a18e189f2e45b5be (diff) | |
| download | kernel_samsung_crespo-43001c9515cf87935c50e84b3e27b1f3b3776b5d.zip kernel_samsung_crespo-43001c9515cf87935c50e84b3e27b1f3b3776b5d.tar.gz kernel_samsung_crespo-43001c9515cf87935c50e84b3e27b1f3b3776b5d.tar.bz2 | |
[ALSA] hda-intel - Fix suspend/resume with MSI
Fixed suspend/resume with MSI enablement.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 6309e0c..4d2df77 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1381,6 +1381,10 @@ static int azx_suspend(struct pci_dev *pci, pm_message_t state) snd_pcm_suspend_all(chip->pcm[i]); snd_hda_suspend(chip->bus, state); azx_free_cmd_io(chip); + if (chip->irq >= 0) + free_irq(chip->irq, chip); + if (!disable_msi) + pci_disable_msi(chip->pci); pci_disable_device(pci); pci_save_state(pci); return 0; @@ -1393,6 +1397,12 @@ static int azx_resume(struct pci_dev *pci) pci_restore_state(pci); pci_enable_device(pci); + if (!disable_msi) + pci_enable_msi(pci); + /* FIXME: need proper error handling */ + request_irq(pci->irq, azx_interrupt, IRQF_DISABLED|IRQF_SHARED, + "HDA Intel", chip); + chip->irq = pci->irq; pci_set_master(pci); azx_init_chip(chip); snd_hda_resume(chip->bus); |