diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-11-21 06:14:23 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@server.perex.cz> | 2006-12-20 02:55:57 -0500 |
commit | 437a5a4606c12ab904793a7cad5b2062fc76c04e (patch) | |
tree | 57a8b320f931ddd29ecc5933d7f6acc68dc35ef7 /sound/pci/intel8x0m.c | |
parent | 01f681da496831eb3aff5a908cefdafe74dd263b (diff) |
[ALSA] Remove IRQF_DISABLED for shared PCI irqs
Fix IRQ flags for PCI devices.
The shared IRQs for PCI devices shouldn't be allocated with
IRQF_DISABLED. Also, when MSI is enabled, IRQF_SHARED shouldn't
be used.
The patch removes unnecessary cast in request_irq and free_irq,
too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index bd467c501123..09dcf923b547 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -1071,7 +1071,7 @@ static int intel8x0m_resume(struct pci_dev *pci) | |||
1071 | } | 1071 | } |
1072 | pci_set_master(pci); | 1072 | pci_set_master(pci); |
1073 | if (request_irq(pci->irq, snd_intel8x0_interrupt, | 1073 | if (request_irq(pci->irq, snd_intel8x0_interrupt, |
1074 | IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) { | 1074 | IRQF_SHARED, card->shortname, chip)) { |
1075 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " | 1075 | printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, " |
1076 | "disabling device\n", pci->irq); | 1076 | "disabling device\n", pci->irq); |
1077 | snd_card_disconnect(card); | 1077 | snd_card_disconnect(card); |
@@ -1205,7 +1205,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card, | |||
1205 | } | 1205 | } |
1206 | 1206 | ||
1207 | port_inited: | 1207 | port_inited: |
1208 | if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED, | 1208 | if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_SHARED, |
1209 | card->shortname, chip)) { | 1209 | card->shortname, chip)) { |
1210 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1210 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1211 | snd_intel8x0_free(chip); | 1211 | snd_intel8x0_free(chip); |