diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 23:51:48 +0200 |
| commit | 9430148d800dd929ad73da4c6afb67f793f8af43 (patch) | |
| tree | 437d0aec41428cbb310a202100ba581c63fbe89e /sound/isa/es18xx.c | |
| parent | Merge branch 'topic/misc' into for-linus (diff) | |
| parent | sound: irq: Remove IRQF_DISABLED (diff) | |
| download | linux-9430148d800dd929ad73da4c6afb67f793f8af43.tar.xz linux-9430148d800dd929ad73da4c6afb67f793f8af43.zip | |
Merge branch 'topic/remove-irqf_disable' into for-linus
Diffstat (limited to 'sound/isa/es18xx.c')
| -rw-r--r-- | sound/isa/es18xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index aeee8f8bf5e9..bf6ad0bf51c6 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -1805,7 +1805,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, return -EBUSY; } - if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", + if (request_irq(irq, snd_es18xx_interrupt, 0, "ES18xx", (void *) card)) { snd_es18xx_free(card); snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); |