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

Commit 66dcdafe authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Jiri Kosina
Browse files

Revert "HID: multitouch: Support ALPS PTP stick with pid 0x120A" 

This reverts commit fcaa4a07.

As noted by Masaki [1], 0x120A + trackpoint will not be used in mass
production machines, so remove the ID accordingly.

[1] http://www.spinics.net/lists/linux-input/msg53222.html



Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 814b6d17

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 


#define USB_VENDOR_ID_ALPS_JP		0x044E

#define HID_DEVICE_ID_ALPS_U1_DUAL	0x120B

#define HID_DEVICE_ID_ALPS_U1_PTP_2		0x120A

#define HID_DEVICE_ID_ALPS_U1_DUAL_PTP	0x121F

#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP	0x1220

drivers/hid/hid-multitouch.c

+0 −4
Original line number Diff line number Diff line
@@ -1419,10 +1419,6 @@ static const struct hid_device_id mt_devices[] = { 
		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },

	{ .driver_data = MT_CLS_WIN_8_DUAL,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ALPS_JP,

			HID_DEVICE_ID_ALPS_U1_PTP_2) },



	/* Lenovo X1 TAB Gen 2 */

	{ .driver_data = MT_CLS_WIN_8_DUAL,