From d9db08bd116ac703aaafdc5cc7dfbb366b43b1c2 Mon Sep 17 00:00:00 2001
From: Michael Shalayeff <mickey@cvs.openbsd.org>
Date: Sat, 27 Oct 2001 20:54:25 +0000
Subject: remove unused timeout in lockinit() per art@'s idea. fix the init
 state handling on failure; reported by nate@.

---
 sys/dev/i2o/iop.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index a84409b74a3..834ecf43578 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iop.c,v 1.18 2001/07/27 09:55:08 niklas Exp $	*/
+/*	$OpenBSD: iop.c,v 1.19 2001/10/27 20:54:24 mickey Exp $	*/
 /*	$NetBSD: iop.c,v 1.12 2001/03/21 14:27:05 ad Exp $	*/
 
 /*-
@@ -400,22 +400,23 @@ iop_init(struct iop_softc *sc, const char *intrstr)
 	    sc->sc_maxob, letoh32(sc->sc_status.maxoutboundmframes));
 #endif
 
-	lockinit(&sc->sc_conflock, PRIBIO, "iopconf", hz * 30, 0);
+	lockinit(&sc->sc_conflock, PRIBIO, "iopconf", 0, 0);
 
 	startuphook_establish((void (*)(void *))iop_config_interrupts, sc);
 	kthread_create_deferred(iop_create_reconf_thread, sc);
 	return;
 
  bail_out:
-	if (state > 3)
+	if (state > 4)
 		free(im, M_DEVBUF);
-	if (state > 2)
+	if (state > 3)
 		bus_dmamap_unload(sc->sc_dmat, sc->sc_scr_dmamap);
-	if (state > 1)
+	if (state > 2)
 		bus_dmamem_unmap(sc->sc_dmat, sc->sc_scr, PAGE_SIZE);
-	if (state > 0)
+	if (state > 1)
 		bus_dmamem_free(sc->sc_dmat, sc->sc_scr_seg, nsegs);
-	bus_dmamap_destroy(sc->sc_dmat, sc->sc_scr_dmamap);
+	if (state > 0)
+		bus_dmamap_destroy(sc->sc_dmat, sc->sc_scr_dmamap);
 }
 
 /*
-- 
cgit v1.2.3