summaryrefslogtreecommitdiff
path: root/sound/pci/vx222
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-11-21 12:14:23 +0100
committerJaroslav Kysela <perex@server.perex.cz>2006-12-20 08:55:57 +0100
commit437a5a4606c12ab904793a7cad5b2062fc76c04e (patch)
tree57a8b320f931ddd29ecc5933d7f6acc68dc35ef7 /sound/pci/vx222
parent01f681da496831eb3aff5a908cefdafe74dd263b (diff)
downloadlinux-3.10-437a5a4606c12ab904793a7cad5b2062fc76c04e.tar.gz
linux-3.10-437a5a4606c12ab904793a7cad5b2062fc76c04e.tar.bz2
linux-3.10-437a5a4606c12ab904793a7cad5b2062fc76c04e.zip
[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/vx222')
-rw-r--r--sound/pci/vx222/vx222.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index af49e8aabf5..89f58ea180b 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -169,8 +169,8 @@ static int __devinit snd_vx222_create(struct snd_card *card, struct pci_dev *pci
for (i = 0; i < 2; i++)
vx->port[i] = pci_resource_start(pci, i + 1);
- if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_DISABLED|IRQF_SHARED,
- CARD_NAME, (void *) chip)) {
+ if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED,
+ CARD_NAME, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
snd_vx222_free(chip);
return -EBUSY;