git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] Remove IRQF_DISABLED for shared PCI irqs
[safe/jmp/linux-2.6]
/
sound
/
pci
/
mixart
/
mixart.c
diff --git
a/sound/pci/mixart/mixart.c
b/sound/pci/mixart/mixart.c
index
216aee5
..
21386da
100644
(file)
--- 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)
/* 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) {
/* 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));
}
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;
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr);
return -EBUSY;