diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-08-29 12:54:25 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 15:59:32 +0200 |
| commit | 2d4a485b3d02fe65b0a0bcec3c53760c17bdece3 (patch) | |
| tree | 68cef50b18629f6d3b47a523b8eccc839992821c /sound/isa/sb | |
| parent | [ALSA] emu10k1: There's no need to cast vmalloc() return value in snd_emu10k1... (diff) | |
| download | linux-2d4a485b3d02fe65b0a0bcec3c53760c17bdece3.tar.xz linux-2d4a485b3d02fe65b0a0bcec3c53760c17bdece3.zip | |
[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.c | 4 |
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, chip->dma16 = -1; chip->port = port; - if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ? + if (request_irq(irq, irq_handler, + (hardware == SB_HW_ALS4000 || + hardware == SB_HW_CS5530) ? IRQF_SHARED : IRQF_DISABLED, "SoundBlaster", (void *) chip)) { snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq); |