aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/es1688
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 22:29:46 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 16:58:54 -0400
commit65ca68b30073473583f6ca2f463cbd94ade43ddb (patch)
treef7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/isa/es1688
parent63a43399db67d6f94364f933f68f38f58387737a (diff)
[PATCH] irq-flags: sound: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/isa/es1688')
-rw-r--r--sound/isa/es1688/es1688.c2
-rw-r--r--sound/isa/es1688/es1688_lib.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index e90689ee162..7f29f56e405 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -153,7 +153,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev)
153 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, 153 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
154 chip->mpu_port, 0, 154 chip->mpu_port, 0,
155 xmpu_irq, 155 xmpu_irq,
156 SA_INTERRUPT, 156 IRQF_DISABLED,
157 NULL)) < 0) 157 NULL)) < 0)
158 goto _err; 158 goto _err;
159 } 159 }
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 702ad51ee9d..7e985d3bc51 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -659,7 +659,7 @@ int snd_es1688_create(struct snd_card *card,
659 snd_es1688_free(chip); 659 snd_es1688_free(chip);
660 return -EBUSY; 660 return -EBUSY;
661 } 661 }
662 if (request_irq(irq, snd_es1688_interrupt, SA_INTERRUPT, "ES1688", (void *) chip)) { 662 if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {
663 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq); 663 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
664 snd_es1688_free(chip); 664 snd_es1688_free(chip);
665 return -EBUSY; 665 return -EBUSY;