aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Burkholder <jake@FreeBSD.org>2002-10-01 00:17:39 +0000
committerJake Burkholder <jake@FreeBSD.org>2002-10-01 00:17:39 +0000
commitc7f73b67b598ddcc9112e1bd25b41f9b3f7a867a (patch)
tree4d52f69f1ad0cb32349bbbf0cfdd955dcbc23282
parenta88b260a86f7ca981b8404a98fc9051c04c79cd5 (diff)
Notes
-rw-r--r--sys/sparc64/sparc64/bus_machdep.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 897e04d36b6d..13979921a6da 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -268,9 +268,12 @@ nexus_dmamap_create(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, int flags,
{
/* Not much to do...? */
- *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_WAITOK | M_ZERO);
- ddmat->map_count++;
- return (0);
+ *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO);
+ if (*mapp != NULL) {
+ ddmat->map_count++;
+ return (0);
+ } else
+ return (ENOMEM);
}
/*
@@ -422,7 +425,7 @@ int
sparc64_dmamem_alloc_map(bus_dma_tag_t dmat, bus_dmamap_t *mapp)
{
- *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_WAITOK | M_ZERO);
+ *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO);
if (*mapp == NULL)
return (ENOMEM);