Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c16d2409 authored by Ping Cheng's avatar Ping Cheng Committed by Greg Kroah-Hartman
Browse files

Input: wacom - make sure touch_max is set for touch devices 



commit 1d0d6df02750b4a6f466768cbfbf860e24f4c8d4 upstream.

Old single touch Tablet PCs do not have touch_max set at
wacom_features. Since touch device at lease supports one
finger, assign touch_max to 1 when touch usage is defined
in its HID Descriptor and touch_max is not pre-defined.

Tested-by: default avatarJason Gerecke <killertofu@gmail.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Reviewed-by: default avatarChris Bagwell <chris@cnpbagwell.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8705bd42

drivers/input/tablet/wacom_sys.c

+5 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int wacom_parse_hid(struct usb_interface *intf, 
	struct usb_device *dev = interface_to_usbdev(intf);

	char limit = 0;

	/* result has to be defined as int for some devices */

	int result = 0;

	int result = 0, touch_max = 0;

	int i = 0, usage = WCM_UNDEFINED, finger = 0, pen = 0;

	unsigned char *report;
@@ -386,7 +386,8 @@ static int wacom_parse_hid(struct usb_interface *intf, 
				if (usage == WCM_DESKTOP) {

					if (finger) {

						features->device_type = BTN_TOOL_FINGER;



						/* touch device at least supports one touch point */

						touch_max = 1;

						switch (features->type) {

						case TABLETPC2FG:

							features->pktlen = WACOM_PKGLEN_TPC2FG;
@@ -539,6 +540,8 @@ static int wacom_parse_hid(struct usb_interface *intf, 
	}



 out:

	if (!features->touch_max && touch_max)

		features->touch_max = touch_max;

	result = 0;

	kfree(report);

	return result;