svn commit: r359055 - stable/12/sys/dev/usb/input

[Vladimir Kondratyev]

Author: wulf
Date: Tue Mar 17 23:57:06 2020
New Revision: 359055
URL: https://svnweb.freebsd.org/changeset/base/359055

Log:
  MFC r358824:
  
  wmt(4): Fix Synaptics Touch Digitizer V04 attachment
  
  Touch Digitizer V04 report descriptor declares 'Contact Count Maximum' usage
  as constant. That was not supported by descriptor parser.
  
  PR:		232040
  Reported by:	Sergei Akhmatdinov <sakhmatd at darkn.space>

Modified:
  stable/12/sys/dev/usb/input/wmt.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/usb/input/wmt.c
==============================================================================
--- stable/12/sys/dev/usb/input/wmt.c	Tue Mar 17 23:22:07 2020	(r359054)
+++ stable/12/sys/dev/usb/input/wmt.c	Tue Mar 17 23:57:06 2020	(r359055)
@@ -657,9 +657,8 @@ wmt_hid_parse(struct wmt_softc *sc, const void *d_ptr,
 				thqa_cert_rid = hi.report_ID;
 				break;
 			}
-			if (hi.collevel == 1 && touch_coll &&
-			    WMT_HI_ABSOLUTE(hi) && hi.usage ==
-			      HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX)) {
+			if (hi.collevel == 1 && touch_coll && hi.usage ==
+			    HID_USAGE2(HUP_DIGITIZERS, HUD_CONTACT_MAX)) {
 				cont_count_max = hi.logical_maximum;
 				cont_max_rid = hi.report_ID;
 				if (sc != NULL)