| From f3b0cbce01cd5c242b420d986b208d306bdc5083 Mon Sep 17 00:00:00 2001 |
| From: Derya <derya.kiran@yahoo.de> |
| Date: Mon, 31 Mar 2014 13:27:09 -0400 |
| Subject: Revert "HID: microsoft: Add ID's for Surface Type/Touch Cover 2" |
| |
| From: Derya <derya.kiran@yahoo.de> |
| |
| commit f3b0cbce01cd5c242b420d986b208d306bdc5083 upstream. |
| |
| This reverts commit 117309c51dca42121f70cacec801511b76acf75c. |
| |
| 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. |
| |
| Signed-off-by: Derya <derya.kiran@yahoo.de> |
| Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/hid-core.c | 2 -- |
| drivers/hid/hid-ids.h | 2 -- |
| drivers/hid/hid-microsoft.c | 4 ---- |
| 3 files changed, 8 deletions(-) |
| |
| --- a/drivers/hid/hid-core.c |
| +++ b/drivers/hid/hid-core.c |
| @@ -1780,8 +1780,6 @@ static const struct hid_device_id hid_ha |
| { 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_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, |
| { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1) }, |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -624,8 +624,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 |
| --- a/drivers/hid/hid-microsoft.c |
| +++ b/drivers/hid/hid-microsoft.c |
| @@ -208,10 +208,6 @@ static const struct hid_device_id ms_dev |
| .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 }, |
