From owner-p4-projects@FreeBSD.ORG  Fri Dec  8 21:24:20 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 E1F6A16A416; Fri,  8 Dec 2006 21:24:19 +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 BD07F16A403
	for <perforce@freebsd.org>; Fri,  8 Dec 2006 21:24:19 +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 88A7643CB9
	for <perforce@freebsd.org>; Fri,  8 Dec 2006 21:23:18 +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 kB8LOIWk065468
	for <perforce@freebsd.org>; Fri, 8 Dec 2006 21:24:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB8LOI9Q065465
	for perforce@freebsd.org; Fri, 8 Dec 2006 21:24:18 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 8 Dec 2006 21:24:18 GMT
Message-Id: <200612082124.kB8LOI9Q065465@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 111299 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: Fri, 08 Dec 2006 21:24:20 -0000

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

Change 111299 by sam@sam_ebb on 2006/12/08 21:23:36

	o check for device existence before attaching so we don't
	  get duplicates
	o use device_set_desc_copy instead of a static buffer;
	  from jhb

Affected files ...

.. //depot/projects/crypto/sys/crypto/via/padlock.c#4 edit

Differences ...

==== //depot/projects/crypto/sys/crypto/via/padlock.c#4 (text+ko) ====

@@ -73,14 +73,15 @@
 padlock_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, "padlock", -1) == 0)
+	if (device_find_child(parent, "padlock", -1) == NULL &&
+	    BUS_ADD_CHILD(parent, 10, "padlock", -1) == 0)
 		panic("padlock: could not attach");
 }
 
 static int
 padlock_probe(device_t dev)
 {
-	static char capp[256];
+	char capp[256];
 
 #if defined(__i386__) && !defined(PC98)
 	/* If there is no AES support, we has nothing to do here. */
@@ -104,7 +105,7 @@
 	if (via_feature_xcrypt & VIA_HAS_MM)
 		strlcat(capp, ",RSA", sizeof(capp));
 #endif
-	device_set_desc(dev, capp);
+	device_set_desc_copy(dev, capp);
 #else
 	return (EINVAL);
 #endif