diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-26 17:51:48 -0400 |
| commit | 9430148d800dd929ad73da4c6afb67f793f8af43 (patch) | |
| tree | 437d0aec41428cbb310a202100ba581c63fbe89e /sound/pci | |
| parent | d22665702226e9c40bc331098559e3d55e7cd43d (diff) | |
| parent | 88e24c3a4b30a6bd361f2b5ce602667a8161b2e8 (diff) | |
Merge branch 'topic/remove-irqf_disable' into for-linus
Diffstat (limited to 'sound/pci')
| -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) | |||
| 1234 | goto error; | 1234 | goto error; |
| 1235 | } | 1235 | } |
| 1236 | 1236 | ||
| 1237 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1237 | if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, |
| 1238 | KBUILD_MODNAME, sis)) { | 1238 | KBUILD_MODNAME, sis)) { |
| 1239 | printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); | 1239 | printk(KERN_ERR "sis7019: unable to regain IRQ %d\n", pci->irq); |
| 1240 | goto error; | 1240 | goto error; |
| @@ -1340,7 +1340,7 @@ static int __devinit sis_chip_create(struct snd_card *card, | |||
| 1340 | if (rc) | 1340 | if (rc) |
| 1341 | goto error_out_cleanup; | 1341 | goto error_out_cleanup; |
| 1342 | 1342 | ||
| 1343 | if (request_irq(pci->irq, sis_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1343 | if (request_irq(pci->irq, sis_interrupt, IRQF_SHARED, |
| 1344 | KBUILD_MODNAME, sis)) { | 1344 | KBUILD_MODNAME, sis)) { |
| 1345 | printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); | 1345 | printk(KERN_ERR "unable to allocate irq %d\n", sis->irq); |
| 1346 | goto error_out_cleanup; | 1346 | goto error_out_cleanup; |