git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
oss
/
maestro.c
diff --git
a/sound/oss/maestro.c
b/sound/oss/maestro.c
index
e647f2f
..
1d98d10
100644
(file)
--- a/
sound/oss/maestro.c
+++ b/
sound/oss/maestro.c
@@
-3545,7
+3545,7
@@
maestro_probe(struct pci_dev *pcidev,const struct pci_device_id *pdid)
mixer_push_state(card);
}
mixer_push_state(card);
}
- if((ret=request_irq(card->irq, ess_interrupt,
SA_SHIRQ
, card_names[card_type], card)))
+ if((ret=request_irq(card->irq, ess_interrupt,
IRQF_SHARED
, card_names[card_type], card)))
{
printk(KERN_ERR "maestro: unable to allocate irq %d,\n", card->irq);
unregister_sound_mixer(card->dev_mixer);
{
printk(KERN_ERR "maestro: unable to allocate irq %d,\n", card->irq);
unregister_sound_mixer(card->dev_mixer);