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
/
cs4281
/
cs4281m.c
diff --git
a/sound/oss/cs4281/cs4281m.c
b/sound/oss/cs4281/cs4281m.c
index
0004442
..
0400a41
100644
(file)
--- a/
sound/oss/cs4281/cs4281m.c
+++ b/
sound/oss/cs4281/cs4281m.c
@@
-4346,7
+4346,7
@@
static int __devinit cs4281_probe(struct pci_dev *pcidev,
s->pcidev = pcidev;
s->irq = pcidev->irq;
if (request_irq
s->pcidev = pcidev;
s->irq = pcidev->irq;
if (request_irq
- (s->irq, cs4281_interrupt,
SA_SHIRQ
, "Crystal CS4281", s)) {
+ (s->irq, cs4281_interrupt,
IRQF_SHARED
, "Crystal CS4281", s)) {
CS_DBGOUT(CS_INIT | CS_ERROR, 1,
printk(KERN_ERR "cs4281: irq %u in use\n", s->irq));
goto err_irq;
CS_DBGOUT(CS_INIT | CS_ERROR, 1,
printk(KERN_ERR "cs4281: irq %u in use\n", s->irq));
goto err_irq;