From e5a36eda668ee3fda0539561577339a7da11597b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 22 Sep 2006 15:30:42 +0200 Subject: [PATCH] --- yaml --- r: 34968 b: refs/heads/master c: f0063c4489a00ed5395378ef80a7edea4272f20b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/intel8x0m.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ffc07d0670f1..4528362c6b43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b0c4149e82170ebc44b96e9ed96545f8ebd7c81 +refs/heads/master: f0063c4489a00ed5395378ef80a7edea4272f20b diff --git a/trunk/sound/pci/intel8x0m.c b/trunk/sound/pci/intel8x0m.c index 91850281f89b..268e2f7241ea 100644 --- a/trunk/sound/pci/intel8x0m.c +++ b/trunk/sound/pci/intel8x0m.c @@ -1045,6 +1045,8 @@ static int intel8x0m_suspend(struct pci_dev *pci, pm_message_t state) for (i = 0; i < chip->pcm_devs; i++) snd_pcm_suspend_all(chip->pcm[i]); snd_ac97_suspend(chip->ac97); + if (chip->irq >= 0) + free_irq(chip->irq, chip); pci_disable_device(pci); pci_save_state(pci); return 0; @@ -1058,6 +1060,9 @@ static int intel8x0m_resume(struct pci_dev *pci) pci_restore_state(pci); pci_enable_device(pci); pci_set_master(pci); + request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED, + card->shortname, chip); + chip->irq = pci->irq; snd_intel8x0_chip_init(chip, 0); snd_ac97_resume(chip->ac97);