Module Name: src
Committed By: snj
Date: Sun Jul 5 20:34:51 UTC 2015
Modified Files:
src/sys/arch/arm/xscale [netbsd-7]: ixp425_if_npe.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #857):
sys/arch/arm/xscale/ixp425_if_npe.c: revision 1.29
Initialize 'error'.
Can't test, but obvious enough apparently.
Found by Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/arm/xscale/ixp425_if_npe.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/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.26 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.26.2.1
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.26 Sun Aug 10 16:44:33 2014
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c Sun Jul 5 20:34:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_if_npe.c,v 1.26 2014/08/10 16:44:33 tls Exp $ */
+/* $NetBSD: ixp425_if_npe.c,v 1.26.2.1 2015/07/05 20:34:51 snj Exp $ */
/*-
* Copyright (c) 2006 Sam Leffler. All rights reserved.
@@ -28,7 +28,7 @@
#if 0
__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.26 2014/08/10 16:44:33 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.26.2.1 2015/07/05 20:34:51 snj Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -602,8 +602,9 @@ npe_activate(struct npe_softc *sc)
return error;
}
- if (bus_dmamap_load(sc->sc_dt, sc->sc_stats_map, sc->sc_stats,
- sizeof(struct npestats), NULL, BUS_DMA_NOWAIT) != 0) {
+ error = bus_dmamap_load(sc->sc_dt, sc->sc_stats_map, sc->sc_stats,
+ sizeof(struct npestats), NULL, BUS_DMA_NOWAIT);
+ if (error) {
aprint_error_dev(sc->sc_dev,
"unable to %s for %s, error %u\n",
"load map", "stats block", error);
