From owner-svn-src-all@FreeBSD.ORG  Wed Sep 15 19:34:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90B44106566C;
	Wed, 15 Sep 2010 19:34:18 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F99F8FC14;
	Wed, 15 Sep 2010 19:34:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8FJYIvK048189;
	Wed, 15 Sep 2010 19:34:18 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8FJYIwI048187;
	Wed, 15 Sep 2010 19:34:18 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <201009151934.o8FJYIwI048187@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Wed, 15 Sep 2010 19:34:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212691 - stable/8/usr.sbin/bluetooth/bthidd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Sep 2010 19:34:18 -0000

Author: emax
Date: Wed Sep 15 19:34:18 2010
New Revision: 212691
URL: http://svn.freebsd.org/changeset/base/212691

Log:
  MFC r212335
  
  Make sure to only pickup hid_input items when parsing input reports.
  As it turns out, libusbhid(3) also picks up hic_collection items even
  though we explicitly requested hid_input items only.
  
  Tested by:	Buganini < buganini at gmail dot com >

Modified:
  stable/8/usr.sbin/bluetooth/bthidd/hid.c
Directory Properties:
  stable/8/usr.sbin/bluetooth/bthidd/   (props changed)

Modified: stable/8/usr.sbin/bluetooth/bthidd/hid.c
==============================================================================
--- stable/8/usr.sbin/bluetooth/bthidd/hid.c	Wed Sep 15 19:28:06 2010	(r212690)
+++ stable/8/usr.sbin/bluetooth/bthidd/hid.c	Wed Sep 15 19:34:18 2010	(r212691)
@@ -160,7 +160,8 @@ hid_interrupt(bthid_session_p s, uint8_t
 
 	for (d = hid_start_parse(hid_device->desc, 1 << hid_input, -1);
 	     hid_get_item(d, &h) > 0; ) {
-		if ((h.flags & HIO_CONST) || (h.report_ID != report_id))
+		if ((h.flags & HIO_CONST) || (h.report_ID != report_id) ||
+		    (h.kind != hid_input))
 			continue;
 
 		page = HID_PAGE(h.usage);