HID: wacom: Use correct report to query pen ID from INTUOSHT2 devices (0bbfe28a) · Commits · 戴 / test

Unlike other tablets which are compatible with the wacom_intuos_irq handler, INTUOSHT2 devices provide pen ID with report ID 8 instead of 5. To ensure wacom_intuos_schedule_prox_event works as intended for these tablets, we must be sure it uses the correct report ID in this case. Signed-off-by:

Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/wacom_wac.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -439,10 +439,14 @@ exit:
		static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac)
		{
		struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac);
		struct wacom_features *features = &wacom_wac->features;
		struct hid_report *r;
		struct hid_report_enum *re;

		re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]);
		if (features->type == INTUOSHT2)
		r = re->report_id_hash[WACOM_REPORT_INTUOSHT2_ID];
		else
		r = re->report_id_hash[WACOM_REPORT_INTUOS_ID1];
		if (r) {
		hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT);

drivers/hid/wacom_wac.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@
		#define WACOM_REPORT_DEVICE_LIST 16
		#define WACOM_REPORT_INTUOS_PEN 16
		#define WACOM_REPORT_REMOTE 17
		#define WACOM_REPORT_INTUOSHT2_ID 8

		/* device quirks */
		#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001

Admin message