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/ice1712 | |
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/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 8a576b78bee5..8ba31cfb9045 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2614,7 +2614,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card, | |||
2614 | ice->dmapath_port = pci_resource_start(pci, 2); | 2614 | ice->dmapath_port = pci_resource_start(pci, 2); |
2615 | ice->profi_port = pci_resource_start(pci, 3); | 2615 | ice->profi_port = pci_resource_start(pci, 3); |
2616 | 2616 | ||
2617 | if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_DISABLED|IRQF_SHARED, | 2617 | if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED, |
2618 | "ICE1712", ice)) { | 2618 | "ICE1712", ice)) { |
2619 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2619 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2620 | snd_ice1712_free(ice); | 2620 | snd_ice1712_free(ice); |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index e9cbfdf37059..3e3a102e6c34 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2253,7 +2253,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card, | |||
2253 | ice->profi_port = pci_resource_start(pci, 1); | 2253 | ice->profi_port = pci_resource_start(pci, 1); |
2254 | 2254 | ||
2255 | if (request_irq(pci->irq, snd_vt1724_interrupt, | 2255 | if (request_irq(pci->irq, snd_vt1724_interrupt, |
2256 | IRQF_DISABLED|IRQF_SHARED, "ICE1724", ice)) { | 2256 | IRQF_SHARED, "ICE1724", ice)) { |
2257 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2257 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2258 | snd_vt1724_free(ice); | 2258 | snd_vt1724_free(ice); |
2259 | return -EIO; | 2259 | return -EIO; |