diff options
| author | Rafael J. Wysocki <rjwysocki@sisk.pl> | 2005-07-24 20:22:00 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 04:04:26 +0200 |
| commit | 90158b83204842c0108d744326868d91cc9c4dfd (patch) | |
| tree | 15abc30cd06051d74a3caa935d54b1352e2a0978 /sound/pci/intel8x0.c | |
| parent | [ACPI] Always set P-state on initialization (diff) | |
| download | linux-90158b83204842c0108d744326868d91cc9c4dfd.tar.xz linux-90158b83204842c0108d744326868d91cc9c4dfd.zip | |
[ACPI] fix resume issues on Asus L5D
http://bugzilla.kernel.org/show_bug.cgi?id=4416
Signed-off-by: Rafael J. Wysocki <rjwysocki@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 8b33b12fa5dc..2a7e63b5757f 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -2367,6 +2367,8 @@ static int intel8x0_suspend(snd_card_t *card, pm_message_t state) for (i = 0; i < 3; i++) if (chip->ac97[i]) snd_ac97_suspend(chip->ac97[i]); + if (chip->irq >= 0) + free_irq(chip->irq, (void *)chip); pci_disable_device(chip->pci); return 0; } @@ -2378,7 +2380,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); /* refill nocache */ if (chip->fix_nocache) |