diff options
| author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 16:59:20 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 11:19:20 +0200 |
| commit | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (patch) | |
| tree | 25e861892f6287df6cdccf00067b61cd0b322d95 /sound/pci/sis7019.c | |
| parent | af1910a817c5ad52c32dddacc1744cfa1b35889e (diff) | |
| download | linux-stable-88e24c3a4b30a6bd361f2b5ce602667a8161b2e8.tar.gz linux-stable-88e24c3a4b30a6bd361f2b5ce602667a8161b2e8.tar.bz2 linux-stable-88e24c3a4b30a6bd361f2b5ce602667a8161b2e8.zip | |
sound: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/sis7019.c')
| -rw-r--r-- | sound/pci/sis7019.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index bcf61524a13f..5ffb20b18786 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1234,7 +1234,7 @@ static int sis_resume(struct pci_dev *pci) goto error; } - if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, + if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, KBUILD_MODNAME, sis)) { printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); goto error; @@ -1340,7 +1340,7 @@ static int __devinit sis_chip_create(struct snd_card *card, if (rc) goto error_out_cleanup; - if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, + if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, KBUILD_MODNAME, sis)) { printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); goto error_out_cleanup; |