diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2005-11-23 10:00:13 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2005-11-23 10:00:13 +0000 |
| commit | 28ce158b5bb79f9793f76e7a69beafc8a102a91e (patch) | |
| tree | 187e2292236ad5b5446f67362705d220f36e26ec /sys/dev | |
| parent | fbeac4e8ea17ba34c44c52f9dadf2d8b450ec371 (diff) | |
Correct malloc flag handling.
OK deraadt@ mickey@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/isadma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index f73875079e4..6c372b26ef1 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.28 2005/11/21 14:25:09 mickey Exp $ */ +/* $OpenBSD: isadma.c,v 1.29 2005/11/23 10:00:12 mpf Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -683,7 +683,7 @@ isa_malloc(isadev, chan, size, pool, flags) int bflags; struct isa_mem *m; - bflags = flags & M_WAITOK ? BUS_DMA_WAITOK : BUS_DMA_NOWAIT; + bflags = flags & M_NOWAIT ? BUS_DMA_NOWAIT : BUS_DMA_WAITOK; if (isa_dmamem_alloc(isadev, chan, size, &addr, bflags)) return 0; |