From: Rudolf Marek Date: Mon, 10 Oct 2005 10:11:23 +0000 (+0200) Subject: [ALSA] es1938 - Fix resume X-Git-Tag: v2.6.15-rc1~451^2~50 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=c913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd;p=net-next-2.6.git [ALSA] es1938 - Fix resume Modules: ES1938 driver This patch fixes the suspend/resume issue I'm having with ESS-Solo1 soundcard. Without this patch I might get after resume message that kernel is disabling the IRQ5 (soundcard). If there was something playing it wont continue after resume without this patch. Signed-off-by: Rudolf Marek Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 17fa80c2387..e8b8ebf9963 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -1390,7 +1390,8 @@ static int es1938_suspend(snd_card_t *card, pm_message_t state) *d = snd_es1938_reg_read(chip, *s); outb(0x00, SLIO_REG(chip, IRQCONTROL)); /* disable irqs */ - + if (chip->irq >= 0) + free_irq(chip->irq, (void *)chip); pci_disable_device(chip->pci); return 0; } @@ -1401,6 +1402,7 @@ static int es1938_resume(snd_card_t *card) unsigned char *s, *d; pci_enable_device(chip->pci); + request_irq(chip->pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip); snd_es1938_chip_init(chip); /* restore mixer-related registers */