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/azt3328.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/azt3328.c')
-rw-r--r-- | sound/pci/azt3328.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 2414ee630756..43edd2839b5a 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -1513,7 +1513,7 @@ snd_azf3328_free(struct snd_azf3328 *chip) | |||
1513 | __end_hw: | 1513 | __end_hw: |
1514 | snd_azf3328_free_joystick(chip); | 1514 | snd_azf3328_free_joystick(chip); |
1515 | if (chip->irq >= 0) | 1515 | if (chip->irq >= 0) |
1516 | free_irq(chip->irq, (void *)chip); | 1516 | free_irq(chip->irq, chip); |
1517 | pci_release_regions(chip->pci); | 1517 | pci_release_regions(chip->pci); |
1518 | pci_disable_device(chip->pci); | 1518 | pci_disable_device(chip->pci); |
1519 | 1519 | ||
@@ -1724,7 +1724,8 @@ snd_azf3328_create(struct snd_card *card, | |||
1724 | chip->synth_port = pci_resource_start(pci, 3); | 1724 | chip->synth_port = pci_resource_start(pci, 3); |
1725 | chip->mixer_port = pci_resource_start(pci, 4); | 1725 | chip->mixer_port = pci_resource_start(pci, 4); |
1726 | 1726 | ||
1727 | if (request_irq(pci->irq, snd_azf3328_interrupt, IRQF_DISABLED|IRQF_SHARED, card->shortname, (void *)chip)) { | 1727 | if (request_irq(pci->irq, snd_azf3328_interrupt, |
1728 | IRQF_SHARED, card->shortname, chip)) { | ||
1728 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 1729 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
1729 | err = -EBUSY; | 1730 | err = -EBUSY; |
1730 | goto out_err; | 1731 | goto out_err; |