[src/netbsd-7]: src/sys/arch/arm/xscale Pull up following revision(s) (reques...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b67027955211
branches:  netbsd-7
changeset: 799459:b67027955211
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jul 05 20:34:51 2015 +0000

description:
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.

diffstat:

 sys/arch/arm/xscale/ixp425_if_npe.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 3b3d1048c24f -r b67027955211 sys/arch/arm/xscale/ixp425_if_npe.c
--- a/sys/arch/arm/xscale/ixp425_if_npe.c       Sun Jul 05 20:32:56 2015 +0000
+++ b/sys/arch/arm/xscale/ixp425_if_npe.c       Sun Jul 05 20:34:51 2015 +0000
@@ -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 @@
                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);