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/emu10k1/emu10k1_main.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/emu10k1/emu10k1_main.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 8bc4ffa6220d..972ec40d8166 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -759,7 +759,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) | |||
759 | free_pm_buffer(emu); | 759 | free_pm_buffer(emu); |
760 | #endif | 760 | #endif |
761 | if (emu->irq >= 0) | 761 | if (emu->irq >= 0) |
762 | free_irq(emu->irq, (void *)emu); | 762 | free_irq(emu->irq, emu); |
763 | if (emu->port) | 763 | if (emu->port) |
764 | pci_release_regions(emu->pci); | 764 | pci_release_regions(emu->pci); |
765 | if (emu->card_capabilities->ca0151_chip) /* P16V */ | 765 | if (emu->card_capabilities->ca0151_chip) /* P16V */ |
@@ -1246,7 +1246,8 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1246 | } | 1246 | } |
1247 | emu->port = pci_resource_start(pci, 0); | 1247 | emu->port = pci_resource_start(pci, 0); |
1248 | 1248 | ||
1249 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_DISABLED|IRQF_SHARED, "EMU10K1", (void *)emu)) { | 1249 | if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED, |
1250 | "EMU10K1", emu)) { | ||
1250 | err = -EBUSY; | 1251 | err = -EBUSY; |
1251 | goto error; | 1252 | goto error; |
1252 | } | 1253 | } |