From owner-freebsd-usb@FreeBSD.ORG  Fri Apr  8 19:34:18 2005
Return-Path: <owner-freebsd-usb@FreeBSD.ORG>
Delivered-To: freebsd-usb@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5B61616A4CE
	for <usb@freebsd.org>; Fri,  8 Apr 2005 19:34:18 +0000 (GMT)
Received: from smtp.housing.ufl.edu (smtp.housing.ufl.edu [128.227.47.16])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 99AA243D48
	for <usb@freebsd.org>; Fri,  8 Apr 2005 19:34:17 +0000 (GMT)
	(envelope-from WillS@housing.ufl.edu)
Received: (qmail 59466 invoked by uid 98); 8 Apr 2005 15:34:16 -0400
Received: from WillS@housing.ufl.edu by smtp.housing.ufl.edu by uid 1003 with
	qmail-scanner-1.20 
	(spamassassin: 3.0.2.  Clear:RC:1(128.227.47.18):. 
	Processed in 0.026133 secs); 08 Apr 2005 19:34:16 -0000
X-Qmail-Scanner-Mail-From: WillS@housing.ufl.edu via smtp.housing.ufl.edu
X-Qmail-Scanner: 1.20 (Clear:RC:1(128.227.47.18):. Processed in 0.026133 secs)
Received: from bragi.housing.ufl.edu (128.227.47.18)
	by smtp.housing.ufl.edu with (RC4-MD5 encrypted) SMTP;
	8 Apr 2005 15:34:16 -0400
content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
X-MimeOLE: Produced By Microsoft Exchange V6.0.6556.0
Date: Fri, 8 Apr 2005 15:34:14 -0400
Message-ID: <0E972CEE334BFE4291CD07E056C76ED8062D2491@bragi.housing.ufl.edu>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Please commit fix outlined in PR/63837
Thread-Index: AcU8cfJwN4O1aVU0TQu8rJmfCjPabQ==
From: "Will Saxon" <WillS@housing.ufl.edu>
To: <usb@freebsd.org>
Subject: Please commit fix outlined in PR/63837
X-BeenThere: freebsd-usb@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: FreeBSD support for USB <freebsd-usb.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-usb>
List-Post: <mailto:freebsd-usb@freebsd.org>
List-Help: <mailto:freebsd-usb-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-usb>,
	<mailto:freebsd-usb-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Apr 2005 19:34:18 -0000

Is it possible to get the 1 line fix posted in PR/63837 added=20
before 5.4? This has been a problem since before 5.3, the fix is=20
trivial and it works fine.

It is kind of annoying to have to edit hid.c every time I cvsup.

This has been asked about before by myself and others... Is there
a stylistic problem or a planned cleanup that has held this back?

--- /usr/src/sys/dev/usb/hid.c.orig  Fri Apr  8 15:26:46 2005
+++ /usr/src/sys/dev/usb/hid.c       Fri Apr  8 14:55:01 2005
@@ -375,7 +375,7 @@

	id =3D 0;
	for (d =3D hid_start_parse(buf, len, 1<<k); hid_get_item(d, &h); )
-		if (h.report_ID !=3D 0)
+ 		if (h.report_ID !=3D 0 && !id)
			id =3D h.report_ID;
	hid_end_parse(d);
	size =3D h.loc.pos;

-Will