projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/khdrs-2.6
[powerpc.git]
/
sound
/
drivers
/
mtpav.c
diff --git
a/sound/drivers/mtpav.c
b/sound/drivers/mtpav.c
index
474eed0
..
e064d6c
100644
(file)
--- a/
sound/drivers/mtpav.c
+++ b/
sound/drivers/mtpav.c
@@
-590,7
+590,7
@@
static int __init snd_mtpav_get_ISA(struct mtpav * mcard)
return -EBUSY;
}
mcard->port = port;
- if (request_irq(irq, snd_mtpav_irqh,
SA_INTERRUPT
, "MOTU MTPAV", mcard)) {
+ if (request_irq(irq, snd_mtpav_irqh,
IRQF_DISABLED
, "MOTU MTPAV", mcard)) {
snd_printk("MTVAP IRQ %d busy\n", irq);
return -EBUSY;
}