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/als300.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/als300.c')
-rw-r--r-- | sound/pci/als300.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 95f70f3cc37e..9f406fbe0d95 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
@@ -190,7 +190,7 @@ static int snd_als300_free(struct snd_als300 *chip) | |||
190 | snd_als300_dbgcallenter(); | 190 | snd_als300_dbgcallenter(); |
191 | snd_als300_set_irq_flag(chip, IRQ_DISABLE); | 191 | snd_als300_set_irq_flag(chip, IRQ_DISABLE); |
192 | if (chip->irq >= 0) | 192 | if (chip->irq >= 0) |
193 | free_irq(chip->irq, (void *)chip); | 193 | free_irq(chip->irq, chip); |
194 | pci_release_regions(chip->pci); | 194 | pci_release_regions(chip->pci); |
195 | pci_disable_device(chip->pci); | 195 | pci_disable_device(chip->pci); |
196 | kfree(chip); | 196 | kfree(chip); |
@@ -722,8 +722,8 @@ static int __devinit snd_als300_create(snd_card_t *card, | |||
722 | else | 722 | else |
723 | irq_handler = snd_als300_interrupt; | 723 | irq_handler = snd_als300_interrupt; |
724 | 724 | ||
725 | if (request_irq(pci->irq, irq_handler, IRQF_DISABLED|IRQF_SHARED, | 725 | if (request_irq(pci->irq, irq_handler, IRQF_SHARED, |
726 | card->shortname, (void *)chip)) { | 726 | card->shortname, chip)) { |
727 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); | 727 | snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); |
728 | snd_als300_free(chip); | 728 | snd_als300_free(chip); |
729 | return -EBUSY; | 729 | return -EBUSY; |