HID: wacom: fixup quirks setup for WACOM_DEVICETYPE_PAD (a3088abc) · Commits · 戴 / test

Given that INTUOSHT < BAMBOO_PT features->type >= INTUOSHT || features->type <= BAMBOO_PT condition is always true, and therefore device_type is under certain circumstances wrongly set with WACOM_DEVICETYPE_PAD bit set. Fix the condition so that it actually represents the range as intended. Reported-by:

David Binderman <dcb314@hotmail.com> Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/wacom_wac.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2481,7 +2481,7 @@ void wacom_setup_device_quirks(struct wacom *wacom)
	if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {		if (features->pktlen == WACOM_PKGLEN_BBTOUCH3) {
	if (features->touch_max)		if (features->touch_max)
	features->device_type \|= WACOM_DEVICETYPE_TOUCH;		features->device_type \|= WACOM_DEVICETYPE_TOUCH;
	if (features->type >= INTUOSHT \|\| features->type <= BAMBOO_PT)		if (features->type >= INTUOSHT && features->type <= BAMBOO_PT)
	features->device_type \|= WACOM_DEVICETYPE_PAD;		features->device_type \|= WACOM_DEVICETYPE_PAD;

	features->x_max = 4096;		features->x_max = 4096;

Admin message