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/ad1889.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/ad1889.c')
-rw-r--r-- | sound/pci/ad1889.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index cbf8331c3d33..98970d401be9 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -858,7 +858,7 @@ snd_ad1889_free(struct snd_ad1889 *chip) | |||
858 | synchronize_irq(chip->irq); | 858 | synchronize_irq(chip->irq); |
859 | 859 | ||
860 | if (chip->irq >= 0) | 860 | if (chip->irq >= 0) |
861 | free_irq(chip->irq, (void*)chip); | 861 | free_irq(chip->irq, chip); |
862 | 862 | ||
863 | skip_hw: | 863 | skip_hw: |
864 | if (chip->iobase) | 864 | if (chip->iobase) |
@@ -945,7 +945,7 @@ snd_ad1889_create(struct snd_card *card, | |||
945 | spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ | 945 | spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ |
946 | 946 | ||
947 | if (request_irq(pci->irq, snd_ad1889_interrupt, | 947 | if (request_irq(pci->irq, snd_ad1889_interrupt, |
948 | IRQF_DISABLED|IRQF_SHARED, card->driver, (void*)chip)) { | 948 | IRQF_SHARED, card->driver, chip)) { |
949 | printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq); | 949 | printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq); |
950 | snd_ad1889_free(chip); | 950 | snd_ad1889_free(chip); |
951 | return -EBUSY; | 951 | return -EBUSY; |