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/ali5451 | |
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/ali5451')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index a7edd56542d4..9327ab2eccb0 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -2095,7 +2095,7 @@ static int snd_ali_free(struct snd_ali * codec) | |||
2095 | snd_ali_disable_address_interrupt(codec); | 2095 | snd_ali_disable_address_interrupt(codec); |
2096 | if (codec->irq >= 0) { | 2096 | if (codec->irq >= 0) { |
2097 | synchronize_irq(codec->irq); | 2097 | synchronize_irq(codec->irq); |
2098 | free_irq(codec->irq, (void *)codec); | 2098 | free_irq(codec->irq, codec); |
2099 | } | 2099 | } |
2100 | if (codec->port) | 2100 | if (codec->port) |
2101 | pci_release_regions(codec->pci); | 2101 | pci_release_regions(codec->pci); |
@@ -2192,7 +2192,8 @@ static int __devinit snd_ali_resources(struct snd_ali *codec) | |||
2192 | return err; | 2192 | return err; |
2193 | codec->port = pci_resource_start(codec->pci, 0); | 2193 | codec->port = pci_resource_start(codec->pci, 0); |
2194 | 2194 | ||
2195 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, IRQF_DISABLED|IRQF_SHARED, "ALI 5451", (void *)codec)) { | 2195 | if (request_irq(codec->pci->irq, snd_ali_card_interrupt, |
2196 | IRQF_SHARED, "ALI 5451", codec)) { | ||
2196 | snd_printk(KERN_ERR "Unable to request irq.\n"); | 2197 | snd_printk(KERN_ERR "Unable to request irq.\n"); |
2197 | return -EBUSY; | 2198 | return -EBUSY; |
2198 | } | 2199 | } |