projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sound: irq: Remove IRQF_DISABLED
[firefly-linux-kernel-4.4.55.git]
/
sound
/
isa
/
gus
/
interwave.c
diff --git
a/sound/isa/gus/interwave.c
b/sound/isa/gus/interwave.c
index 534a6eced2b810882a4676834926b3703fddf1d4..5f869a32b48ce9427b2eedffc1b7de2d3b45efd8 100644
(file)
--- a/
sound/isa/gus/interwave.c
+++ b/
sound/isa/gus/interwave.c
@@
-26,7
+26,6
@@
#include <linux/err.h>
#include <linux/isa.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/isa.h>
#include <linux/delay.h>
-#include <linux/slab.h>
#include <linux/pnp.h>
#include <linux/moduleparam.h>
#include <asm/dma.h>
#include <linux/pnp.h>
#include <linux/moduleparam.h>
#include <asm/dma.h>
@@
-685,7
+684,7
@@
static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
if ((err = snd_gus_initialize(gus)) < 0)
return err;
if ((err = snd_gus_initialize(gus)) < 0)
return err;
- if (request_irq(xirq, snd_interwave_interrupt,
IRQF_DISABLED
,
+ if (request_irq(xirq, snd_interwave_interrupt,
0
,
"InterWave", iwcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
return -EBUSY;
"InterWave", iwcard)) {
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
return -EBUSY;