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
/
isa
/
cs423x
/
cs4231_lib.c
diff --git
a/sound/isa/cs423x/cs4231_lib.c
b/sound/isa/cs423x/cs4231_lib.c
index
823db82
..
fbb2017
100644
(file)
--- a/
sound/isa/cs423x/cs4231_lib.c
+++ b/
sound/isa/cs423x/cs4231_lib.c
@@
-1454,7
+1454,7
@@
int snd_cs4231_create(struct snd_card *card,
return -ENODEV;
}
chip->cport = cport;
return -ENODEV;
}
chip->cport = cport;
- if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt,
SA_INTERRUPT
, "CS4231", (void *) chip)) {
+ if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt,
IRQF_DISABLED
, "CS4231", (void *) chip)) {
snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq);
snd_cs4231_free(chip);
return -EBUSY;
snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq);
snd_cs4231_free(chip);
return -EBUSY;