aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
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/pci/intel8x0.c
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/pci/intel8x0.c')
-rw-r--r--sound/pci/intel8x0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index edc14475ef82..5634bc349257 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2475,7 +2475,7 @@ static int intel8x0_resume(struct pci_dev *pci)
2475 pci_restore_state(pci); 2475 pci_restore_state(pci);
2476 pci_enable_device(pci); 2476 pci_enable_device(pci);
2477 pci_set_master(pci); 2477 pci_set_master(pci);
2478 request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, 2478 request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED,
2479 card->shortname, chip); 2479 card->shortname, chip);
2480 chip->irq = pci->irq; 2480 chip->irq = pci->irq;
2481 synchronize_irq(chip->irq); 2481 synchronize_irq(chip->irq);
@@ -2848,7 +2848,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
2848 2848
2849 /* request irq after initializaing int_sta_mask, etc */ 2849 /* request irq after initializaing int_sta_mask, etc */
2850 if (request_irq(pci->irq, snd_intel8x0_interrupt, 2850 if (request_irq(pci->irq, snd_intel8x0_interrupt,
2851 SA_INTERRUPT|SA_SHIRQ, card->shortname, chip)) { 2851 IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) {
2852 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2852 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2853 snd_intel8x0_free(chip); 2853 snd_intel8x0_free(chip);
2854 return -EBUSY; 2854 return -EBUSY;