Commit f3b0cbce authored by Derya's avatar Derya Committed by Jiri Kosina
Browse files

Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2" 



This reverts commit 117309c5.

The MS Surface Pro 2 has an USB composite device with 3 interfaces
- interface 0 - sensor hub
- interface 1 - wacom digitizer
- interface 2 - the keyboard cover, if one is attached
This USB composite device changes it product id dependent on if and which
keyboard cover is attached. Adding the covers to hid_have_special_driver
prevents loading the right hid drivers for the other two interfaces, all 3
get loaded with hid-microsoft. We don't even need hid-microsoft for the
keyboards. We have to revert this to load the right hid modules for each
interface.

CC: stable@vger.kernel.org # kernel 3.14 only
Signed-off-by: default avatarDerya <derya.kiran@yahoo.de>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 30f58877

drivers/hid/hid-core.c

+0 −2
Original line number Diff line number Diff line
@@ -1821,8 +1821,6 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },

drivers/hid/hid-ids.h

+0 −2
Original line number Diff line number Diff line
@@ -630,8 +630,6 @@ 
#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_TOUCH_COVER_2	0x07a7

#define USB_DEVICE_ID_MS_TYPE_COVER_2	0x07a9



#define USB_VENDOR_ID_MOJO		0x8282

#define USB_DEVICE_ID_RETRO_ADAPTER	0x3201

drivers/hid/hid-microsoft.c

+0 −4
Original line number Diff line number Diff line
@@ -274,10 +274,6 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),

		.driver_data = MS_DUPLICATE_USAGES },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2),

		.driver_data = 0 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2),

		.driver_data = 0 },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),

		.driver_data = MS_PRESENTER },

CRA Git | Maintained and supported by SUSTech CRA and CCSE