diff options
author | Oliver Neukum <oneukum@suse.de> | 2015-03-30 06:36:35 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 08:25:43 -0400 |
commit | 003e817a9ecf6cfded59630858bbf04056d71e9a (patch) | |
tree | 7a0856ddc1d64106c50530af15babe7220e36b9d /drivers/hid | |
parent | b70b82580248b5393241c986082842ec05a2b7d7 (diff) |
HID: usbhid: more mice with ALWAYS_POLL
During a stress test these mice kept dropping and reappearing
in runlevel 1 as opposed to 5.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-ids.h | 4 | ||||
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7fe5590b328b..34124a0008b9 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -595,6 +595,9 @@ | |||
595 | #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 | 595 | #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110 |
596 | #define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f | 596 | #define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f |
597 | #define USB_DEVICE_ID_LOGITECH_HARMONY_PS3 0x0306 | 597 | #define USB_DEVICE_ID_LOGITECH_HARMONY_PS3 0x0306 |
598 | #define USB_DEVICE_ID_LOGITECH_MOUSE_C01A 0xc01a | ||
599 | #define USB_DEVICE_ID_LOGITECH_MOUSE_C05A 0xc05a | ||
600 | #define USB_DEVICE_ID_LOGITECH_MOUSE_C06A 0xc06a | ||
598 | #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD_CORD 0xc20a | 601 | #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD_CORD 0xc20a |
599 | #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD 0xc211 | 602 | #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD 0xc211 |
600 | #define USB_DEVICE_ID_LOGITECH_EXTREME_3D 0xc215 | 603 | #define USB_DEVICE_ID_LOGITECH_EXTREME_3D 0xc215 |
@@ -1026,6 +1029,7 @@ | |||
1026 | #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 | 1029 | #define USB_DEVICE_ID_ZYTRONIC_ZXY100 0x0005 |
1027 | 1030 | ||
1028 | #define USB_VENDOR_ID_PRIMAX 0x0461 | 1031 | #define USB_VENDOR_ID_PRIMAX 0x0461 |
1032 | #define USB_DEVICE_ID_PRIMAX_MOUSE_4D22 0x4d22 | ||
1029 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 | 1033 | #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 |
1030 | 1034 | ||
1031 | 1035 | ||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 4e3ae9fbb9b5..4e345fbe55f2 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -81,6 +81,9 @@ static const struct hid_blacklist { | |||
81 | { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, | 81 | { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, |
82 | { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, | 82 | { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL }, |
83 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL }, | 83 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL }, |
84 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C01A, HID_QUIRK_ALWAYS_POLL }, | ||
85 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A, HID_QUIRK_ALWAYS_POLL }, | ||
86 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A, HID_QUIRK_ALWAYS_POLL }, | ||
84 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, | 87 | { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, |
85 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, | 88 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, |
86 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS }, | 89 | { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS }, |
@@ -94,6 +97,7 @@ static const struct hid_blacklist { | |||
94 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, | 97 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, |
95 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, | 98 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, |
96 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS }, | 99 | { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS }, |
100 | { USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4D22, HID_QUIRK_ALWAYS_POLL }, | ||
97 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, | 101 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, |
98 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET }, | 102 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET }, |
99 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET }, | 103 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET }, |