summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2011-06-27 21:33:21 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2011-06-27 21:33:21 +0000
commit3786d1a982dc519f35d8546cc1dc2df4f11b0010 (patch)
treee0a2f4ea0c34c327473d8eb4aec18a8d7c160eb0
parentfe231fef250303344190a744cd241458e1f937d6 (diff)
Unbreak iopool conversion by putting the implicit yet missing important
initialization statements. Found the hard way by Sebastiaan Indesteege
-rw-r--r--sys/dev/ic/oosiop.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 91cba5d4de3..910710c4eb5 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oosiop.c,v 1.18 2011/04/03 12:42:36 krw Exp $ */
+/* $OpenBSD: oosiop.c,v 1.19 2011/06/27 21:33:20 miod Exp $ */
/* $NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $ */
/*
@@ -242,6 +242,9 @@ oosiop_attach(struct oosiop_softc *sc)
if (sc->sc_minperiod < 25)
sc->sc_minperiod = 25; /* limit to 10MB/s */
+ mtx_init(&sc->sc_cb_mtx, IPL_BIO);
+ scsi_iopool_init(&sc->sc_iopool, sc, oosiop_cb_alloc, oosiop_cb_free);
+
printf(": NCR53C700%s rev %d, %dMHz\n",
sc->sc_chip == OOSIOP_700_66 ? "-66" : "",
oosiop_read_1(sc, OOSIOP_CTEST7) >> 4,
@@ -267,6 +270,7 @@ oosiop_attach(struct oosiop_softc *sc)
sc->sc_link.openings = 1; /* XXX */
sc->sc_link.adapter_buswidth = OOSIOP_NTGT;
sc->sc_link.adapter_target = sc->sc_id;
+ sc->sc_link.pool = &sc->sc_iopool;
sc->sc_link.quirks = ADEV_NODOORLOCK;
bzero(&saa, sizeof(saa));