Commit b1807719 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: Correct General touch PID 



Genera Touch told us that 0001 is their single point device
and 0003 is the multitouch one. Apparently, we made the tests
someone having a prototype, and not the final product.
They said it should be safe to do the switch.

This partially reverts 5572da08 ("HID: hid-mulitouch: add support
for the 'Sensing Win7-TwoFinger'").

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 30307c69

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1771,8 +1771,8 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },

drivers/hid/hid-ids.h

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002



#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0001

#define USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS 0x0003



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

CRA Git | Maintained and supported by SUSTech CRA and CCSE