Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

1 files changed, 6 insertions, 1 deletions

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 7c806bd9cc90..d7af3e474432 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2376,6 +2376,9 @@ static int intel8x0_suspend(snd_card_t *card, pm_message_t state)
                         snd_ac97_suspend(chip->ac97[i]);
         if (chip->device_type == DEVICE_INTEL_ICH4)
                 chip->sdm_saved = igetbyte(chip, ICHREG(SDM));
+
+        if (chip->irq >= 0)
+                free_irq(chip->irq, (void *)chip);
         pci_disable_device(chip->pci);
         return 0;
 }
@@ -2387,7 +2390,9 @@ static int intel8x0_resume(snd_card_t *card)
 
         pci_enable_device(chip->pci);
         pci_set_master(chip->pci);
-        snd_intel8x0_chip_init(chip, 0);
+        request_irq(chip->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip);
+        synchronize_irq(chip->irq);
+        snd_intel8x0_chip_init(chip, 1);
 
         /* re-initialize mixer stuff */
         if (chip->device_type == DEVICE_INTEL_ICH4) {