Commit 7adb91bd authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina
Browse files

HID: wacom: fix Intuos wireless report id issue 



Intuos Pen in wireless mode does not have the same report id (2) as
when it is in USB mode (17).

This patch also moves WIRELESS next to REMOTE in type enum so we
can group devices with similar features easily.

Reported-by: default avatarDale Brewe <dlbrewe@hotmail.com>
Tested-by: default avatarDale Brewe <dlbrewe@hotmail.com>
Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8d515fda

drivers/hid/wacom_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int wacom_query_tablet_data(struct hid_device *hdev, 
			return wacom_set_device_mode(hdev, 2, 2, 2);

		}

	} else if (features->device_type & WACOM_DEVICETYPE_PEN) {

		if (features->type <= BAMBOO_PT && features->type != WIRELESS) {

		if (features->type <= BAMBOO_PT) {

			return wacom_set_device_mode(hdev, 2, 2, 2);

		}

	}

drivers/hid/wacom_wac.c

+0 −1
Original line number Diff line number Diff line
@@ -2066,7 +2066,6 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len) 
	struct wacom_features *features = &wacom->features;



	if ((features->type == INTUOSHT2) &&

	    (wacom->data[0] == WACOM_REPORT_INTUOS_PEN) &&

	    (features->device_type & WACOM_DEVICETYPE_PEN))

		return wacom_intuos_irq(wacom);

	else if (len == WACOM_PKGLEN_BBTOUCH)

drivers/hid/wacom_wac.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ enum { 
	WACOM_BEE,

	WACOM_13HD,

	WACOM_MO,

	WIRELESS,

	BAMBOO_PEN,

	INTUOSHT,

	INTUOSHT2,
@@ -138,6 +137,7 @@ enum { 
	WACOM_24HDT,

	WACOM_27QHDT,

	BAMBOO_PAD,

	WIRELESS,

	REMOTE,

	TABLETPC,   /* add new TPC below */

	TABLETPCE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE