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/mixart/mixart.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/mixart/mixart.c')
-rw-r--r-- | sound/pci/mixart/mixart.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 216aee5f93e7..21386da3bc86 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -1066,7 +1066,7 @@ static int snd_mixart_free(struct mixart_mgr *mgr) | |||
1066 | 1066 | ||
1067 | /* release irq */ | 1067 | /* release irq */ |
1068 | if (mgr->irq >= 0) | 1068 | if (mgr->irq >= 0) |
1069 | free_irq(mgr->irq, (void *)mgr); | 1069 | free_irq(mgr->irq, mgr); |
1070 | 1070 | ||
1071 | /* reset board if some firmware was loaded */ | 1071 | /* reset board if some firmware was loaded */ |
1072 | if(mgr->dsp_loaded) { | 1072 | if(mgr->dsp_loaded) { |
@@ -1319,7 +1319,8 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
1319 | pci_resource_len(pci, i)); | 1319 | pci_resource_len(pci, i)); |
1320 | } | 1320 | } |
1321 | 1321 | ||
1322 | if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_DISABLED|IRQF_SHARED, CARD_NAME, (void *)mgr)) { | 1322 | if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED, |
1323 | CARD_NAME, mgr)) { | ||
1323 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1324 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1324 | snd_mixart_free(mgr); | 1325 | snd_mixart_free(mgr); |
1325 | return -EBUSY; | 1326 | return -EBUSY; |