[src/trunk]: src/sys/dev/ieee1394 Let's try initializing the pointers *before...

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

details:   https://anonhg.NetBSD.org/src/rev/7c4a75b3636d
branches:  trunk
changeset: 349031:7c4a75b3636d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Nov 21 01:19:35 2016 +0000

description:
Let's try initializing the pointers *before* dereferencing them!

Oops.

diffstat:

 sys/dev/ieee1394/fwohci.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 480d39e0c6dd -r 7c4a75b3636d sys/dev/ieee1394/fwohci.c
--- a/sys/dev/ieee1394/fwohci.c Mon Nov 21 00:54:21 2016 +0000
+++ b/sys/dev/ieee1394/fwohci.c Mon Nov 21 01:19:35 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci.c,v 1.140 2016/11/20 22:56:13 riastradh Exp $   */
+/*     $NetBSD: fwohci.c,v 1.141 2016/11/21 01:19:35 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.140 2016/11/20 22:56:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.141 2016/11/21 01:19:35 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -428,8 +428,6 @@
        if (i == 0)
                return ENXIO;
 
-       fw_init_isodma(&sc->fc);
-
        for (i = 0; i < sc->fc.nisodma; i++) {
                sc->fc.it[i] = &sc->it[i].xferq;
                sc->fc.ir[i] = &sc->ir[i].xferq;
@@ -441,6 +439,8 @@
                sc->ir[i].off = OHCI_IROFF(i);
        }
 
+       fw_init_isodma(&sc->fc);
+
        sc->fc.config_rom = fwdma_alloc_setup(sc->fc.dev, sc->fc.dmat,
            CROMSIZE, &sc->crom_dma, CROMSIZE, BUS_DMA_NOWAIT);
        if (sc->fc.config_rom == NULL) {