Module Name: src
Committed By: rin
Date: Thu Mar 22 12:20:56 UTC 2018
Modified Files:
src/sys/dev/ic: ninjascsi32.c
Log Message:
Do not call scsipi routines via njsc32_init before scsibus is attached.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/ninjascsi32.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/dev/ic/ninjascsi32.c
diff -u src/sys/dev/ic/ninjascsi32.c:1.24 src/sys/dev/ic/ninjascsi32.c:1.25
--- src/sys/dev/ic/ninjascsi32.c:1.24 Sat Sep 14 21:52:49 2013
+++ src/sys/dev/ic/ninjascsi32.c Thu Mar 22 12:20:55 2018
@@ -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 @@ njsc32_attach(struct njsc32_softc *sc)
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 @@ njsc32_attach(struct njsc32_softc *sc)
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
