From owner-p4-projects@FreeBSD.ORG  Tue Oct 21 14:48:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 90ECC1065672; Tue, 21 Oct 2008 14:48:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 53EC2106566B
	for <perforce@FreeBSD.org>; Tue, 21 Oct 2008 14:48:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 42F228FC23
	for <perforce@FreeBSD.org>; Tue, 21 Oct 2008 14:48:25 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9LEmPkI016263
	for <perforce@FreeBSD.org>; Tue, 21 Oct 2008 14:48:25 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEmPgB016261
	for perforce@freebsd.org; Tue, 21 Oct 2008 14:48:25 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 21 Oct 2008 14:48:25 GMT
Message-Id: <200810211448.m9LEmPgB016261@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 151662 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, 21 Oct 2008 14:48:25 -0000

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

Change 151662 by hselasky@hselasky_laptop001 on 2008/10/21 14:47:25

	
	Fix witness complaints.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#27 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#27 (text+ko) ====

@@ -1303,15 +1303,20 @@
 		    "No free USB device index for new device!\n");
 		return (NULL);
 	}
+	if (depth > 0x10) {
+		device_printf(bus->bdev,
+		    "Invalid device depth!\n");
+		return (NULL);
+	}
 	udev = malloc(sizeof(*udev), M_USB, M_WAITOK | M_ZERO);
 	if (udev == NULL) {
 		return (NULL);
 	}
 	/* initialise our SX-lock */
-	sx_init(udev->default_sx, "USB device SX lock");
+	sx_init(udev->default_sx, "0123456789ABCDEF - USB device SX lock" + depth);
 
 	/* initialise our SX-lock */
-	sx_init(udev->default_sx + 1, "USB config SX lock");
+	sx_init(udev->default_sx + 1, "0123456789ABCDEF - USB config SX lock" + depth);
 
 	usb2_cv_init(udev->default_cv, "WCTRL");
 	usb2_cv_init(udev->default_cv + 1, "UGONE");