Re: linuxppc modular sound patch

Takashi Oe (toe@unlserve.unl.edu)
Sun, 14 Nov 1999 04:18:24 -0600 (CST)


On Fri, 12 Nov 1999, brandon wrote:

> sorry, assuming that my previous email with patch was the correct thing
> to do, there must be another bug that has to do with dynamically
> allocating interrupts.

I thought this bug was fixed a long time ago. Attached patch should fix
it.

Takashi Oe

diff -urN vger-991109/dmasound.c dmasound-991113/dmasound.c
--- vger-991109/dmasound.c Fri Aug 20 21:32:41 1999
+++ dmasound-991113/dmasound.c Sun Nov 14 04:14:19 1999
@@ -3003,8 +3003,10 @@

static int __init PMacIrqInit(void)
{
- if (request_irq(awacs_irq, pmac_awacs_intr, 0, "AWACS", 0)
- || request_irq(awacs_tx_irq, pmac_awacs_tx_intr, 0, "AWACS out", 0))
+ if (request_irq(awacs_irq, pmac_awacs_intr, 0, "AWACS",
+ (void *)awacs)
+ || request_irq(awacs_tx_irq, pmac_awacs_tx_intr, 0, "AWACS out",
+ (void *)awacs))
return 0;
return 1;
}
@@ -3016,8 +3018,8 @@
out_le32(&awacs_txdma->control, RUN<<16);
/* disable interrupts from awacs interface */
out_le32(&awacs->control, in_le32(&awacs->control) & 0xfff);
- free_irq(awacs_irq, pmac_awacs_intr);
- free_irq(awacs_tx_irq, pmac_awacs_tx_intr);
+ free_irq(awacs_irq, (void *)awacs);
+ free_irq(awacs_tx_irq, (void *)awacs);
kfree(awacs_tx_cmd_space);
if (beep_buf)
kfree(beep_buf);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/