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/intel8x0.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/intel8x0.c')
-rw-r--r-- | sound/pci/intel8x0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 9c1bce7afa86..30aaa6092a84 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -2509,7 +2509,7 @@ static int intel8x0_resume(struct pci_dev *pci) | |||
2509 | } | 2509 | } |
2510 | pci_set_master(pci); | 2510 | pci_set_master(pci); |
2511 | if (request_irq(pci->irq, snd_intel8x0_interrupt, | 2511 | if (request_irq(pci->irq, snd_intel8x0_interrupt, |
2512 | IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) { | 2512 | IRQF_SHARED, card->shortname, chip)) { |
2513 | printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " | 2513 | printk(KERN_ERR "intel8x0: unable to grab IRQ %d, " |
2514 | "disabling device\n", pci->irq); | 2514 | "disabling device\n", pci->irq); |
2515 | snd_card_disconnect(card); | 2515 | snd_card_disconnect(card); |
@@ -2887,7 +2887,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card, | |||
2887 | 2887 | ||
2888 | /* request irq after initializaing int_sta_mask, etc */ | 2888 | /* request irq after initializaing int_sta_mask, etc */ |
2889 | if (request_irq(pci->irq, snd_intel8x0_interrupt, | 2889 | if (request_irq(pci->irq, snd_intel8x0_interrupt, |
2890 | IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) { | 2890 | IRQF_SHARED, card->shortname, chip)) { |
2891 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 2891 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
2892 | snd_intel8x0_free(chip); | 2892 | snd_intel8x0_free(chip); |
2893 | return -EBUSY; | 2893 | return -EBUSY; |