diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-11-21 12:14:23 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@server.perex.cz> | 2006-12-20 08:55:57 +0100 |
| commit | 437a5a4606c12ab904793a7cad5b2062fc76c04e (patch) | |
| tree | 57a8b320f931ddd29ecc5933d7f6acc68dc35ef7 /sound/pci/mixart | |
| parent | 01f681da496831eb3aff5a908cefdafe74dd263b (diff) | |
| download | kernel_samsung_aries-437a5a4606c12ab904793a7cad5b2062fc76c04e.zip kernel_samsung_aries-437a5a4606c12ab904793a7cad5b2062fc76c04e.tar.gz kernel_samsung_aries-437a5a4606c12ab904793a7cad5b2062fc76c04e.tar.bz2 | |
[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')
| -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 216aee5..21386da 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) /* release irq */ if (mgr->irq >= 0) - free_irq(mgr->irq, (void *)mgr); + free_irq(mgr->irq, mgr); /* reset board if some firmware was loaded */ if(mgr->dsp_loaded) { @@ -1319,7 +1319,8 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, pci_resource_len(pci, i)); } - if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_DISABLED|IRQF_SHARED, CARD_NAME, (void *)mgr)) { + if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED, + CARD_NAME, mgr)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); snd_mixart_free(mgr); return -EBUSY; |