From owner-p4-projects@FreeBSD.ORG  Sat Sep 16 17:55:36 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 6D74916A407; Sat, 16 Sep 2006 17:55:36 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2D17316A412
	for <perforce@FreeBSD.org>; Sat, 16 Sep 2006 17:55:36 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D42E243D5E
	for <perforce@FreeBSD.org>; Sat, 16 Sep 2006 17:55:35 +0000 (GMT)
	(envelope-from hselasky@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 k8GHtZm1081737
	for <perforce@FreeBSD.org>; Sat, 16 Sep 2006 17:55:35 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8GHtZMM081734
	for perforce@freebsd.org; Sat, 16 Sep 2006 17:55:35 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 16 Sep 2006 17:55:35 GMT
Message-Id: <200609161755.k8GHtZMM081734@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 106215 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: Sat, 16 Sep 2006 17:55:36 -0000

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

Change 106215 by hselasky@hselasky_mini_itx on 2006/09/16 17:55:29

	Undo change 106147 until further, to reduce the 
	number of differences between FreeBSD-7-current
	and the USB project.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#19 (text+ko) ====

@@ -142,29 +142,29 @@
 		}
 	}
 #ifdef USBVERBOSE
-	if ((vendor == NULL) || (product == NULL)) {
+	if (vendor == NULL || product == NULL) {
 		for(kdp = usb_knowndevs;
 		    kdp->vendorname != NULL;
 		    kdp++) {
-			if ((kdp->vendor == UGETW(udd->idVendor)) &&
-			   ((kdp->product == UGETW(udd->idProduct)) ||
-			    (kdp->flags & USB_KNOWNDEV_NOPROD)))
+			if (kdp->vendor == UGETW(udd->idVendor) &&
+			   (kdp->product == UGETW(udd->idProduct) ||
+			    (kdp->flags & USB_KNOWNDEV_NOPROD) != 0))
 				break;
 		}
 		if (kdp->vendorname != NULL) {
 			if (vendor == NULL)
 			    vendor = kdp->vendorname;
 			if (product == NULL)
-			    product = ((kdp->flags & USB_KNOWNDEV_NOPROD) == 0) ?
+			    product = (kdp->flags & USB_KNOWNDEV_NOPROD) == 0 ?
 			        kdp->productname : NULL;
 		}
 	}
 #endif
-	if ((vendor != NULL) && *vendor)
+	if (vendor != NULL && *vendor)
 		strcpy(v, vendor);
 	else
 		sprintf(v, "vendor 0x%04x", UGETW(udd->idVendor));
-	if ((product != NULL) && *product)
+	if (product != NULL && *product)
 		strcpy(p, product);
 	else
 		sprintf(p, "product 0x%04x", UGETW(udd->idProduct));