diff options
author | Jiri Kosina <jkosina@suse.cz> | 2007-04-04 04:56:12 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2007-04-11 04:36:03 -0400 |
commit | bf892e60d0b32989bc55ef64cd6557a49806f0cf (patch) | |
tree | afd40cac05b8c15d075cbc9f9c635a34853451be | |
parent | 5d6341c606b9eb62fbaa7b2a0da82ac851bf0fc4 (diff) |
USB HID: extend quirk for Logitech S510 keyboard
Logitech S510 keyboard is shipped with USB receivers with various product
ids, all need their report descriptor to be fixed. This adds PID 0xc50c.
Reported by Christophe Colombier in kernel.org bugzilla #7352
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 823e3dfca003..c94516c05a4e 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -226,7 +226,8 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); | |||
226 | 226 | ||
227 | #define USB_VENDOR_ID_LOGITECH 0x046d | 227 | #define USB_VENDOR_ID_LOGITECH 0x046d |
228 | #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER 0xc101 | 228 | #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER 0xc101 |
229 | #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER_2 0xc517 | 229 | #define USB_DEVICE_ID_S510_USB_RECEIVER 0xc50c |
230 | #define USB_DEVICE_ID_S510_USB_RECEIVER_2 0xc517 | ||
230 | #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 | 231 | #define USB_DEVICE_ID_DINOVO_EDGE 0xc714 |
231 | 232 | ||
232 | #define USB_VENDOR_ID_MCC 0x09db | 233 | #define USB_VENDOR_ID_MCC 0x09db |
@@ -433,7 +434,8 @@ static const struct hid_blacklist { | |||
433 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, | 434 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, |
434 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE }, | 435 | { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE }, |
435 | 436 | ||
436 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_USB_RECEIVER_2, HID_QUIRK_LOGITECH_S510_DESCRIPTOR }, | 437 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_USB_RECEIVER, HID_QUIRK_LOGITECH_S510_DESCRIPTOR }, |
438 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_USB_RECEIVER_2, HID_QUIRK_LOGITECH_S510_DESCRIPTOR }, | ||
437 | 439 | ||
438 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, | 440 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, |
439 | 441 | ||