diff options
author | Rudolf Marek <r.marek@sh.cvut.cz> | 2005-10-10 06:11:23 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:18:18 -0500 |
commit | c913f69b0d1b9f3f3aa39f49a240cb0fb9d7c6dd (patch) | |
tree | fe65bf4fd53513adf09e0d527ddb4e6aef00cb91 /sound/pci/es1938.c | |
parent | 94651a5bf5143053d34ea9f957dba4f33c1afb15 (diff) |
[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.c | 4 |
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) | |||
1390 | *d = snd_es1938_reg_read(chip, *s); | 1390 | *d = snd_es1938_reg_read(chip, *s); |
1391 | 1391 | ||
1392 | outb(0x00, SLIO_REG(chip, IRQCONTROL)); /* disable irqs */ | 1392 | outb(0x00, SLIO_REG(chip, IRQCONTROL)); /* disable irqs */ |
1393 | 1393 | if (chip->irq >= 0) | |
1394 | free_irq(chip->irq, (void *)chip); | ||
1394 | pci_disable_device(chip->pci); | 1395 | pci_disable_device(chip->pci); |
1395 | return 0; | 1396 | return 0; |
1396 | } | 1397 | } |
@@ -1401,6 +1402,7 @@ static int es1938_resume(snd_card_t *card) | |||
1401 | unsigned char *s, *d; | 1402 | unsigned char *s, *d; |
1402 | 1403 | ||
1403 | pci_enable_device(chip->pci); | 1404 | pci_enable_device(chip->pci); |
1405 | request_irq(chip->pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, "ES1938", (void *)chip); | ||
1404 | snd_es1938_chip_init(chip); | 1406 | snd_es1938_chip_init(chip); |
1405 | 1407 | ||
1406 | /* restore mixer-related registers */ | 1408 | /* restore mixer-related registers */ |