Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Do not call scsipi routines via njsc32_init befor...



details:   https://anonhg.NetBSD.org/src/rev/77220e362bed
branches:  trunk
changeset: 360666:77220e362bed
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Mar 22 12:20:55 2018 +0000

description:
Do not call scsipi routines via njsc32_init before scsibus is attached.

diffstat:

 sys/dev/ic/ninjascsi32.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r d3691aef08fd -r 77220e362bed sys/dev/ic/ninjascsi32.c
--- a/sys/dev/ic/ninjascsi32.c  Thu Mar 22 12:16:11 2018 +0000
+++ b/sys/dev/ic/ninjascsi32.c  Thu Mar 22 12:20:55 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ninjascsi32.c,v 1.24 2013/09/14 21:52:49 martin Exp $  */
+/*     $NetBSD: ninjascsi32.c,v 1.25 2018/03/22 12:20:55 rin Exp $     */
 
 /*-
  * Copyright (c) 2004, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.24 2013/09/14 21:52:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.25 2018/03/22 12:20:55 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -645,9 +645,6 @@
 
        sc->sc_sync_max = 1;    /* XXX look up EEPROM configuration? */
 
-       /* initialize hardware and target structure */
-       njsc32_init(sc, cold);
-
        /* setup adapter */
        sc->sc_adapter.adapt_dev = sc->sc_dev;
        sc->sc_adapter.adapt_nchannels = 1;
@@ -667,6 +664,9 @@
        sc->sc_channel.chan_id = NJSC32_INITIATOR_ID;
 
        sc->sc_scsi = config_found(sc->sc_dev, &sc->sc_channel, scsiprint);
+
+       /* initialize hardware and target structure */
+       njsc32_init(sc, cold);
 }
 
 int



Home | Main Index | Thread Index | Old Index