aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-08-29 06:54:25 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 09:59:32 -0400
commit2d4a485b3d02fe65b0a0bcec3c53760c17bdece3 (patch)
tree68cef50b18629f6d3b47a523b8eccc839992821c /sound/isa/sb
parent36726d9df7746efc2f71bb63f39f8ac7f7951a26 (diff)
[ALSA] Allow shared IRQ for CS5530 device
CS5530 is a PCI device and often shares the IRQ although the SB common routine tries to allocate it exclusively. This patch allows shared IRQ for CS5530. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/isa/sb')
-rw-r--r--sound/isa/sb/sb_common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index efa9d5c2558a..37470c3010ef 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -234,7 +234,9 @@ int snd_sbdsp_create(struct snd_card *card,
234 chip->dma16 = -1; 234 chip->dma16 = -1;
235 chip->port = port; 235 chip->port = port;
236 236
237 if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ? 237 if (request_irq(irq, irq_handler,
238 (hardware == SB_HW_ALS4000 ||
239 hardware == SB_HW_CS5530) ?
238 IRQF_SHARED : IRQF_DISABLED, 240 IRQF_SHARED : IRQF_DISABLED,
239 "SoundBlaster", (void *) chip)) { 241 "SoundBlaster", (void *) chip)) {
240 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq); 242 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);