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/es1938.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/es1938.c')
-rw-r--r-- | sound/pci/es1938.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 1a8d36df4b5d..66ac26c5a240 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -1508,7 +1508,7 @@ static int es1938_resume(struct pci_dev *pci) | |||
1508 | } | 1508 | } |
1509 | 1509 | ||
1510 | if (request_irq(pci->irq, snd_es1938_interrupt, | 1510 | if (request_irq(pci->irq, snd_es1938_interrupt, |
1511 | IRQF_DISABLED|IRQF_SHARED, "ES1938", chip)) { | 1511 | IRQF_SHARED, "ES1938", chip)) { |
1512 | printk(KERN_ERR "es1938: unable to grab IRQ %d, " | 1512 | printk(KERN_ERR "es1938: unable to grab IRQ %d, " |
1513 | "disabling device\n", pci->irq); | 1513 | "disabling device\n", pci->irq); |
1514 | snd_card_disconnect(card); | 1514 | snd_card_disconnect(card); |
@@ -1631,7 +1631,7 @@ static int __devinit snd_es1938_create(struct snd_card *card, | |||
1631 | chip->vc_port = pci_resource_start(pci, 2); | 1631 | chip->vc_port = pci_resource_start(pci, 2); |
1632 | chip->mpu_port = pci_resource_start(pci, 3); | 1632 | chip->mpu_port = pci_resource_start(pci, 3); |
1633 | chip->game_port = pci_resource_start(pci, 4); | 1633 | chip->game_port = pci_resource_start(pci, 4); |
1634 | if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1634 | if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED, |
1635 | "ES1938", chip)) { | 1635 | "ES1938", chip)) { |
1636 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1636 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1637 | snd_es1938_free(chip); | 1637 | snd_es1938_free(chip); |