Date: Wed, 15 Sep 2010 19:34:18 +0000 (UTC) From: Maksim Yevmenkin <emax@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r212691 - stable/8/usr.sbin/bluetooth/bthidd Message-ID: <201009151934.o8FJYIwI048187@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009151934.o8FJYIwI048187>