From owner-p4-projects@FreeBSD.ORG  Tue Mar 10 15:18:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E63341065696; Tue, 10 Mar 2009 15:18:53 +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 9AE281065693
	for <perforce@FreeBSD.org>; Tue, 10 Mar 2009 15:18:53 +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 49EB78FC08
	for <perforce@FreeBSD.org>; Tue, 10 Mar 2009 15:18:53 +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 n2AFIqXF028446
	for <perforce@FreeBSD.org>; Tue, 10 Mar 2009 15:18:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AFIqDm028444
	for perforce@freebsd.org; Tue, 10 Mar 2009 15:18:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 10 Mar 2009 15:18:52 GMT
Message-Id: <200903101518.n2AFIqDm028444@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 159001 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, 10 Mar 2009 15:18:55 -0000

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

Change 159001 by hselasky@hselasky_laptop001 on 2009/03/10 15:18:10

	USB CORE: Make sure HID has a default usage.
	Reported by: Paul Wootton

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#20 edit

Differences ...

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

@@ -283,14 +283,14 @@
 					 */
 					c->loc.count = 1;
 				} else {
-					/* make sure we have a usage */
-					if (s->nusage == 0) {
-						s->usages_min[s->nusage] = 0;
-						s->usages_max[s->nusage] = 0;
-						s->nusage = 1;
-					}
 					s->ncount = 1;
 				}
+				/* make sure we have a usage */
+				if (s->nusage == 0) {
+					s->usages_min[s->nusage] = 0;
+					s->usages_max[s->nusage] = 0;
+					s->nusage = 1;
+				}
 				goto top;
 
 			case 9:	/* Output */