diff options
| -rw-r--r-- | drivers/hid/hid-ids.h | 6 | ||||
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 6 | ||||
| -rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92e47e5c9564..c4388776f4e4 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -590,6 +590,9 @@ | |||
| 590 | #define USB_VENDOR_ID_MONTEREY 0x0566 | 590 | #define USB_VENDOR_ID_MONTEREY 0x0566 |
| 591 | #define USB_DEVICE_ID_GENIUS_KB29E 0x3004 | 591 | #define USB_DEVICE_ID_GENIUS_KB29E 0x3004 |
| 592 | 592 | ||
| 593 | #define USB_VENDOR_ID_MSI 0x1770 | ||
| 594 | #define USB_DEVICE_ID_MSI_GX680R_LED_PANEL 0xff00 | ||
| 595 | |||
| 593 | #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400 | 596 | #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400 |
| 594 | #define USB_DEVICE_ID_N_S_HARMONY 0xc359 | 597 | #define USB_DEVICE_ID_N_S_HARMONY 0xc359 |
| 595 | 598 | ||
| @@ -684,6 +687,9 @@ | |||
| 684 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001 | 687 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001 |
| 685 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 | 688 | #define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008 |
| 686 | 689 | ||
| 690 | #define USB_VENDOR_ID_REALTEK 0x0bda | ||
| 691 | #define USB_DEVICE_ID_REALTEK_READER 0x0152 | ||
| 692 | |||
| 687 | #define USB_VENDOR_ID_ROCCAT 0x1e7d | 693 | #define USB_VENDOR_ID_ROCCAT 0x1e7d |
| 688 | #define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4 | 694 | #define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4 |
| 689 | #define USB_DEVICE_ID_ROCCAT_ISKU 0x319c | 695 | #define USB_DEVICE_ID_ROCCAT_ISKU 0x319c |
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 7a1ebb867cf4..82e9211b3ca9 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
| @@ -621,6 +621,7 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, | |||
| 621 | { | 621 | { |
| 622 | struct mt_device *td = hid_get_drvdata(hid); | 622 | struct mt_device *td = hid_get_drvdata(hid); |
| 623 | __s32 quirks = td->mtclass.quirks; | 623 | __s32 quirks = td->mtclass.quirks; |
| 624 | struct input_dev *input = field->hidinput->input; | ||
| 624 | 625 | ||
| 625 | if (hid->claimed & HID_CLAIMED_INPUT) { | 626 | if (hid->claimed & HID_CLAIMED_INPUT) { |
| 626 | switch (usage->hid) { | 627 | switch (usage->hid) { |
| @@ -670,13 +671,16 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field, | |||
| 670 | break; | 671 | break; |
| 671 | 672 | ||
| 672 | default: | 673 | default: |
| 674 | if (usage->type) | ||
| 675 | input_event(input, usage->type, usage->code, | ||
| 676 | value); | ||
| 673 | return; | 677 | return; |
| 674 | } | 678 | } |
| 675 | 679 | ||
| 676 | if (usage->usage_index + 1 == field->report_count) { | 680 | if (usage->usage_index + 1 == field->report_count) { |
| 677 | /* we only take into account the last report. */ | 681 | /* we only take into account the last report. */ |
| 678 | if (usage->hid == td->last_slot_field) | 682 | if (usage->hid == td->last_slot_field) |
| 679 | mt_complete_slot(td, field->hidinput->input); | 683 | mt_complete_slot(td, input); |
| 680 | 684 | ||
| 681 | if (field->index == td->last_field_index | 685 | if (field->index == td->last_field_index |
| 682 | && td->num_received >= td->num_expected) | 686 | && td->num_received >= td->num_expected) |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e0e6abf1cd3b..19b8360f2330 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -73,6 +73,7 @@ static const struct hid_blacklist { | |||
| 73 | { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, | 73 | { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS }, |
| 74 | { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, | 74 | { USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET }, |
| 75 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, | 75 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, |
| 76 | { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 76 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, | 77 | { USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS }, |
| 77 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, | 78 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, |
| 78 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, | 79 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, |
| @@ -80,6 +81,7 @@ static const struct hid_blacklist { | |||
| 80 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, | 81 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, |
| 81 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET }, | 82 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET }, |
| 82 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET }, | 83 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET }, |
| 84 | { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS }, | ||
| 83 | { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, | 85 | { USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET }, |
| 84 | { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, | 86 | { USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET }, |
| 85 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 87 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
