projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
[powerpc.git]
/
sound
/
pci
/
als300.c
diff --git
a/sound/pci/als300.c
b/sound/pci/als300.c
index
901b08a
..
a9c3896
100644
(file)
--- a/
sound/pci/als300.c
+++ b/
sound/pci/als300.c
@@
-724,7
+724,7
@@
static int __devinit snd_als300_create(snd_card_t *card,
else
irq_handler = snd_als300_interrupt;
else
irq_handler = snd_als300_interrupt;
- if (request_irq(pci->irq, irq_handler,
SA_INTERRUPT|SA_SHIRQ
,
+ if (request_irq(pci->irq, irq_handler,
IRQF_DISABLED|IRQF_SHARED
,
card->shortname, (void *)chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_als300_free(chip);
card->shortname, (void *)chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_als300_free(chip);