projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
sound
/
isa
/
es18xx.c
diff --git
a/sound/isa/es18xx.c
b/sound/isa/es18xx.c
index
af60b0b
..
34998de
100644
(file)
--- a/
sound/isa/es18xx.c
+++ b/
sound/isa/es18xx.c
@@
-1837,7
+1837,7
@@
static int __devinit snd_es18xx_new_device(struct snd_card *card,
return -EBUSY;
}
return -EBUSY;
}
- if (request_irq(irq, snd_es18xx_interrupt,
SA_INTERRUPT
, "ES18xx", (void *) chip)) {
+ if (request_irq(irq, snd_es18xx_interrupt,
IRQF_DISABLED
, "ES18xx", (void *) chip)) {
snd_es18xx_free(chip);
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
return -EBUSY;
snd_es18xx_free(chip);
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
return -EBUSY;