Module Name: src
Committed By: nonaka
Date: Sun Mar 21 13:34:20 UTC 2010
Modified Files:
src/sys/arch/landisk/landisk: bus_dma.c
Log Message:
more fix.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/landisk/landisk/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/landisk/landisk/bus_dma.c
diff -u src/sys/arch/landisk/landisk/bus_dma.c:1.9 src/sys/arch/landisk/landisk/bus_dma.c:1.10
--- src/sys/arch/landisk/landisk/bus_dma.c:1.9 Sun Mar 21 13:10:38 2010
+++ src/sys/arch/landisk/landisk/bus_dma.c Sun Mar 21 13:34:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.9 2010/03/21 13:10:38 nonaka Exp $ */
+/* $NetBSD: bus_dma.c,v 1.10 2010/03/21 13:34:19 nonaka Exp $ */
/*
* Copyright (c) 2005 NONAKA Kimihiro
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.9 2010/03/21 13:10:38 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.10 2010/03/21 13:34:19 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@
mapsize = sizeof(struct _bus_dmamap)
+ (sizeof(bus_dma_segment_t) * (nsegments - 1));
mapstore = malloc(mapsize, M_DMAMAP, M_ZERO
- | (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+ | ((flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK));
if (mapstore == NULL)
return ENOMEM;
