diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-microsoft.c | 2 | ||||
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index bcd914a63af2..6ae2dddaab0c 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -725,6 +725,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) | |||
| 725 | 725 | ||
| 726 | if (hid->vendor == USB_VENDOR_ID_MICROSOFT && | 726 | if (hid->vendor == USB_VENDOR_ID_MICROSOFT && |
| 727 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || | 727 | (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || |
| 728 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 || | ||
| 728 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || | 729 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || |
| 729 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || | 730 | hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || |
| 730 | hid->product == USB_DEVICE_ID_MS_POWER_COVER) && | 731 | hid->product == USB_DEVICE_ID_MS_POWER_COVER) && |
| @@ -1928,6 +1929,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 1928 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, | 1929 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, |
| 1929 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, | 1930 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) }, |
| 1930 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, | 1931 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, |
| 1932 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, | ||
| 1931 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, | 1933 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, |
| 1932 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, | 1934 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, |
| 1933 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, | 1935 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index f769208276ae..01bb2fae6925 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -679,6 +679,7 @@ | |||
| 679 | #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 | 679 | #define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7 |
| 680 | #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 | 680 | #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 |
| 681 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc | 681 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc |
| 682 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2 | ||
| 682 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd | 683 | #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd |
| 683 | #define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de | 684 | #define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07de |
| 684 | #define USB_DEVICE_ID_MS_POWER_COVER 0x07da | 685 | #define USB_DEVICE_ID_MS_POWER_COVER 0x07da |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 9aa3515090a7..77a2cf3e4afe 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
| @@ -278,6 +278,8 @@ static const struct hid_device_id ms_devices[] = { | |||
| 278 | .driver_data = MS_DUPLICATE_USAGES }, | 278 | .driver_data = MS_DUPLICATE_USAGES }, |
| 279 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), | 279 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3), |
| 280 | .driver_data = MS_HIDINPUT }, | 280 | .driver_data = MS_HIDINPUT }, |
| 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2), | ||
| 282 | .driver_data = MS_HIDINPUT }, | ||
| 281 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), | 283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), |
| 282 | .driver_data = MS_HIDINPUT }, | 284 | .driver_data = MS_HIDINPUT }, |
| 283 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), | 285 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 1dff8f0015ba..5ef80c8d5bcf 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -91,6 +91,7 @@ static const struct hid_blacklist { | |||
| 91 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS }, | 91 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS }, |
| 92 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS }, | 92 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS }, |
| 93 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, | 93 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, |
| 94 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 94 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, | 95 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, |
| 95 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, | 96 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, |
| 96 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, | 97 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, |
