diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-11-21 06:14:23 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@server.perex.cz> | 2006-12-20 02:55:57 -0500 |
commit | 437a5a4606c12ab904793a7cad5b2062fc76c04e (patch) | |
tree | 57a8b320f931ddd29ecc5933d7f6acc68dc35ef7 /sound/pci/es1968.c | |
parent | 01f681da496831eb3aff5a908cefdafe74dd263b (diff) |
[ALSA] Remove IRQF_DISABLED for shared PCI irqs
Fix IRQ flags for PCI devices.
The shared IRQs for PCI devices shouldn't be allocated with
IRQF_DISABLED. Also, when MSI is enabled, IRQF_SHARED shouldn't
be used.
The patch removes unnecessary cast in request_irq and free_irq,
too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/es1968.c')
-rw-r--r-- | sound/pci/es1968.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 01c521d1b460..dc84c189b05f 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2462,7 +2462,7 @@ static int snd_es1968_free(struct es1968 *chip) | |||
2462 | } | 2462 | } |
2463 | 2463 | ||
2464 | if (chip->irq >= 0) | 2464 | if (chip->irq >= 0) |
2465 | free_irq(chip->irq, (void *)chip); | 2465 | free_irq(chip->irq, chip); |
2466 | snd_es1968_free_gameport(chip); | 2466 | snd_es1968_free_gameport(chip); |
2467 | chip->master_switch = NULL; | 2467 | chip->master_switch = NULL; |
2468 | chip->master_volume = NULL; | 2468 | chip->master_volume = NULL; |
@@ -2552,8 +2552,8 @@ static int __devinit snd_es1968_create(struct snd_card *card, | |||
2552 | return err; | 2552 | return err; |
2553 | } | 2553 | } |
2554 | chip->io_port = pci_resource_start(pci, 0); | 2554 | chip->io_port = pci_resource_start(pci, 0); |
2555 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_DISABLED|IRQF_SHARED, | 2555 | if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED, |
2556 | "ESS Maestro", (void*)chip)) { | 2556 | "ESS Maestro", chip)) { |
2557 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2557 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2558 | snd_es1968_free(chip); | 2558 | snd_es1968_free(chip); |
2559 | return -EBUSY; | 2559 | return -EBUSY; |