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/echoaudio/echoaudio.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/echoaudio/echoaudio.c')
-rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index e5e88fe54de0..047e0b5bf15d 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c | |||
@@ -1872,7 +1872,7 @@ static int snd_echo_free(struct echoaudio *chip) | |||
1872 | DE_INIT(("Stopped.\n")); | 1872 | DE_INIT(("Stopped.\n")); |
1873 | 1873 | ||
1874 | if (chip->irq >= 0) | 1874 | if (chip->irq >= 0) |
1875 | free_irq(chip->irq, (void *)chip); | 1875 | free_irq(chip->irq, chip); |
1876 | 1876 | ||
1877 | if (chip->dsp_registers) | 1877 | if (chip->dsp_registers) |
1878 | iounmap(chip->dsp_registers); | 1878 | iounmap(chip->dsp_registers); |
@@ -1950,8 +1950,8 @@ static __devinit int snd_echo_create(struct snd_card *card, | |||
1950 | chip->dsp_registers = (volatile u32 __iomem *) | 1950 | chip->dsp_registers = (volatile u32 __iomem *) |
1951 | ioremap_nocache(chip->dsp_registers_phys, sz); | 1951 | ioremap_nocache(chip->dsp_registers_phys, sz); |
1952 | 1952 | ||
1953 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_DISABLED | IRQF_SHARED, | 1953 | if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, |
1954 | ECHOCARD_NAME, (void *)chip)) { | 1954 | ECHOCARD_NAME, chip)) { |
1955 | snd_echo_free(chip); | 1955 | snd_echo_free(chip); |
1956 | snd_printk(KERN_ERR "cannot grab irq\n"); | 1956 | snd_printk(KERN_ERR "cannot grab irq\n"); |
1957 | return -EBUSY; | 1957 | return -EBUSY; |