Module Name: src
Committed By: martin
Date: Tue Feb 25 19:16:23 UTC 2020
Modified Files:
src/sys/arch/arm/arm32 [netbsd-9]: bus_dma.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #721):
sys/arch/arm/arm32/bus_dma.c: revision 1.119
sys/arch/arm/arm32/bus_dma.c: revision 1.120
Make sure to convey a failure to the calling function
Likely fix for PR kern/54999, but that was a one-off panic.
-
Fix previous for non-_ARM32_NEED_BUS_DMA_BOUNCE builds
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.2 -r1.115.2.3 src/sys/arch/arm/arm32/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/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.115.2.2 src/sys/arch/arm/arm32/bus_dma.c:1.115.2.3
--- src/sys/arch/arm/arm32/bus_dma.c:1.115.2.2 Wed Nov 6 09:43:19 2019
+++ src/sys/arch/arm/arm32/bus_dma.c Tue Feb 25 19:16:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $ */
+/* $NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -315,6 +315,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct arm32_bus_dmamap *map;
void *mapstore;
+ int error = 0;
#ifdef DEBUG_DMA
printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx"
@@ -357,7 +358,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
struct arm32_bus_dma_cookie *cookie;
int cookieflags;
void *cookiestore;
- int error;
cookieflags = 0;
@@ -404,7 +404,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
#ifdef DEBUG_DMA
printf("dmamap_create:map=%p\n", map);
#endif /* DEBUG_DMA */
- return 0;
+ return error;
}
/*
