summaryrefslogtreecommitdiff
path: root/sound/pci/es1938.c
diff options
context:
space:
mode:
authorRudolf Marek <r.marek@sh.cvut.cz>2005-10-10 12:11:23 +0200
committerJaroslav Kysela <perex@suse.cz>2005-11-04 13:18:18 +0100
commitc913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd (patch)
treefe65bf4fd53513adf09e0d527ddb4e6aef00cb91 /sound/pci/es1938.c
parent94651a5bf5143053d34ea9f957dba4f33c1afb15 (diff)
downloadkernel-common-c913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd.tar.gz
kernel-common-c913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd.tar.bz2
kernel-common-c913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd.zip
[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 <r.marek@sh.cvut.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/es1938.c')
-rw-r--r--sound/pci/es1938.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 17fa80c23870..e8b8ebf99635 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 */