Update of /cvsroot/alsa/alsa-kernel/isa In directory usw-pr-cvs1:/tmp/cvs-serv26015
Modified Files: sgalaxy.c Log Message: Added IRQ allocation in setup_wss() Index: sgalaxy.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sgalaxy.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sgalaxy.c 3 Oct 2002 10:35:18 -0000 1.10 +++ sgalaxy.c 13 Oct 2002 13:08:40 -0000 1.11 @@ -111,6 +111,10 @@ return 0; } +static void snd_sgalaxy_dummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) +{ +} + static int __init snd_sgalaxy_setup_wss(unsigned long port, int irq, int dma) { static int interrupt_bits[] = {-1, -1, -1, -1, -1, -1, -1, 0x08, -1, @@ -139,17 +143,19 @@ snd_printdd("sgalaxy - setting up IRQ/DMA for WSS\n"); #endif - /* FIXME: this is really bogus --jk */ - /* the irq line is not allocated (thus locked) for this device at the moment */ - disable_irq(irq); - /* initialize IRQ for WSS codec */ tmp = interrupt_bits[irq % 16]; if (tmp < 0) return -EINVAL; + + if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy", +NULL)) + return -EIO; + outb(tmp | 0x40, port); tmp1 = dma_bits[dma % 4]; outb(tmp | tmp1, port); + + free_irq(irq, NULL); return 0; } ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog