git: 6c8f2d24d468 - stable/13 - hmt(4): Do not ignore constant usages in HID report descriptor parser

Vladimir Kondratyev wulf at FreeBSD.org
Mon Aug 23 22:26:16 UTC 2021


The branch stable/13 has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=6c8f2d24d468a1b95dba4db48dcb425a07d49375

commit 6c8f2d24d468a1b95dba4db48dcb425a07d49375
Author:     Jack <MrLightningBolt at users.noreply.github.com>
AuthorDate: 2021-08-16 20:17:41 +0000
Commit:     Vladimir Kondratyev <wulf at FreeBSD.org>
CommitDate: 2021-08-23 22:21:24 +0000

    hmt(4): Do not ignore constant usages in HID report descriptor parser
    
    This fixes hmt to work with MELF0411 1FD2:7012 touchscreen
    
    Obtained from:  sysutils/iichid
    
    (cherry picked from commit cb910670ac59e11808a629c8375c60200f909217)
---
 sys/dev/hid/hmt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/hid/hmt.c b/sys/dev/hid/hmt.c
index 2eb02811a5a4..d04db6954d00 100644
--- a/sys/dev/hid/hmt.c
+++ b/sys/dev/hid/hmt.c
@@ -676,8 +676,8 @@ hmt_hid_parse(struct hmt_softc *sc, const void *d_ptr, hid_size_t d_len,
 	bool scan_time_found = false;
 	bool has_int_button = false;
 
-#define HMT_HI_ABSOLUTE(hi)	\
-	(((hi).flags & (HIO_CONST|HIO_VARIABLE|HIO_RELATIVE)) == HIO_VARIABLE)
+#define HMT_HI_ABSOLUTE(hi)	((hi).nusages != 0 &&	\
+	((hi).flags & (HIO_VARIABLE | HIO_RELATIVE)) == HIO_VARIABLE)
 #define	HUMS_THQA_CERT	0xC5
 
 	/*


More information about the dev-commits-src-branches mailing list