From owner-p4-projects@FreeBSD.ORG  Tue Dec  5 00:56:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62CC516A47B; Tue,  5 Dec 2006 00:56:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2C66E16A415
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 00:56:01 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4265343CA3
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 00:55:22 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB50tv3d083500
	for <perforce@freebsd.org>; Tue, 5 Dec 2006 00:55:57 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB50tvTe083497
	for perforce@freebsd.org; Tue, 5 Dec 2006 00:55:57 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 5 Dec 2006 00:55:57 GMT
Message-Id: <200612050055.kB50tvTe083497@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111091 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2006 00:56:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=111091

Change 111091 by sam@sam_ebb on 2006/12/05 00:55:52

	check if cryptosoft device exists before adding it; this
	works around the device not being detached on module unload

Affected files ...

.. //depot/projects/crypto/sys/opencrypto/cryptosoft.c#3 edit

Differences ...

==== //depot/projects/crypto/sys/opencrypto/cryptosoft.c#3 (text+ko) ====

@@ -975,7 +975,8 @@
 swcr_identify(device_t *dev, device_t parent)
 {
 	/* NB: order 10 is so we get attached after h/w devices */
-	if (BUS_ADD_CHILD(parent, 10, "cryptosoft", -1) == 0)
+	if (device_find_child(parent, "cryptosoft", -1) == NULL &&
+	    BUS_ADD_CHILD(parent, 10, "cryptosoft", -1) == 0)
 		panic("cryptosoft: could not attach");
 }