diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-16 16:48:45 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-16 16:48:45 +0000 |
| commit | ae8c50a317ad0f648fe01f94a1e68867751d5618 (patch) | |
| tree | 63dc45cc774ffeef13279cc345b9776cc21093a6 | |
| parent | 735c2392b48ffb575f6e7b782d15938d9c397569 (diff) | |
Fix logic botch in dmacomputeipl() introduced in rev 1.14.
| -rw-r--r-- | sys/arch/hp300/dev/dma.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c index c390c36ab95..ba2a7cbeba4 100644 --- a/sys/arch/hp300/dev/dma.c +++ b/sys/arch/hp300/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.14 2004/09/29 07:35:52 miod Exp $ */ +/* $OpenBSD: dma.c,v 1.15 2004/12/16 16:48:44 miod Exp $ */ /* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */ /* @@ -182,12 +182,6 @@ dmainit() rev, (rev == 'B') ? 16 : 32); /* - * Our interrupt level must be as high as the highest - * device using DMA (i.e. splbio). - */ - sc->sc_isr.isr_ipl = PSLTOIPL(hp300_bioipl); - - /* * Defer hooking up our interrupt until the first * DMA-using controller has hooked up theirs. */ @@ -208,6 +202,12 @@ dmacomputeipl() if (sc->sc_isr.isr_func != NULL) intr_disestablish(&sc->sc_isr); + /* + * Our interrupt level must be as high as the highest + * device using DMA (i.e. splbio). + */ + sc->sc_isr.isr_ipl = PSLTOIPL(hp300_bioipl); + sc->sc_isr.isr_func = dmaintr; intr_establish(&sc->sc_isr, "dma"); } |