summaryrefslogtreecommitdiff
path: root/sys/scsi/scsiconf.c
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2010-07-24 04:01:53 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2010-07-24 04:01:53 +0000
commit8d3d911020951f8f75c3f759afb4b0456573388b (patch)
tree905fe45faf71f65c0ada6c391a0c21c7e9029256 /sys/scsi/scsiconf.c
parent4ff122cabee18c69a6023687a3824b28bb688472 (diff)
Get rid of scsi_deinit(), and change scsi_init() back to a one-time
initialization strategy, rather than pretending to do user reference counting. Previously, we would re-initialize the SCSI pool(9)s, which had the fun consequence of causing sysctl(kern.pool.npools) to infinite loop at IPL_VM. ok krw@
Diffstat (limited to 'sys/scsi/scsiconf.c')
-rw-r--r--sys/scsi/scsiconf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index d9b7ce40e80..e88a63809c8 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.161 2010/07/01 05:11:18 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.162 2010/07/24 04:01:52 matthew Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -283,9 +283,6 @@ scsibusdetach(struct device *dev, int type)
KASSERT(SLIST_EMPTY(&sb->sc_link));
- /* Free shared data. */
- scsi_deinit();
-
return (0);
}