projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
sound
/
isa
/
gus
/
gusmax.c
diff --git
a/sound/isa/gus/gusmax.c
b/sound/isa/gus/gusmax.c
index
fcf2c8f
..
ac11cae
100644
(file)
--- a/
sound/isa/gus/gusmax.c
+++ b/
sound/isa/gus/gusmax.c
@@
-292,7
+292,7
@@
static int __init snd_gusmax_probe(struct platform_device *pdev)
goto _err;
}
goto _err;
}
- if (request_irq(xirq, snd_gusmax_interrupt,
SA_INTERRUPT
, "GUS MAX", (void *)maxcard)) {
+ if (request_irq(xirq, snd_gusmax_interrupt,
IRQF_DISABLED
, "GUS MAX", (void *)maxcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
err = -EBUSY;
goto _err;
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
err = -EBUSY;
goto _err;