]> err.no Git - linux-2.6/commitdiff
[ALSA] es1938 - Fix resume
authorRudolf Marek <r.marek@sh.cvut.cz>
Mon, 10 Oct 2005 10:11:23 +0000 (12:11 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 4 Nov 2005 12:18:18 +0000 (13:18 +0100)
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>
sound/pci/es1938.c

index 17fa80c23870b8631b6b2a40d5269ee0d2d531c9..e8b8ebf99635eaf8b8e6ee2cab713106bdaa3d60 100644 (file)
@@ -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 */