diff options
author | Brian Schau <brian@schau.com> | 2005-09-05 02:57:41 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-05 02:57:41 -0400 |
commit | 7d25258f69cedc2f2e55eb25ba2e2078060b44f4 (patch) | |
tree | 71c10d2715b9f540992e5d0caa3d982b0458fddf /drivers | |
parent | e875ce374759087771313c9e76b672b86ac20950 (diff) |
Input: HID - add Wireless Security Lock to HID blacklist
The device is a Wireless Security Lock (WSL). The device identifies itself
as a Cypress Ultra Mouse. It is, however, not a mouse at all and as such,
shouldn't be handled as one.
Signed-off-by: Brian Schau <brian@schau.com>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/input/hid-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 485575a70be5..a72129900457 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1377,6 +1377,7 @@ void hid_init_reports(struct hid_device *hid) | |||
1377 | #define USB_VENDOR_ID_CYPRESS 0x04b4 | 1377 | #define USB_VENDOR_ID_CYPRESS 0x04b4 |
1378 | #define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001 | 1378 | #define USB_DEVICE_ID_CYPRESS_MOUSE 0x0001 |
1379 | #define USB_DEVICE_ID_CYPRESS_HIDCOM 0x5500 | 1379 | #define USB_DEVICE_ID_CYPRESS_HIDCOM 0x5500 |
1380 | #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE 0x7417 | ||
1380 | 1381 | ||
1381 | #define USB_VENDOR_ID_BERKSHIRE 0x0c98 | 1382 | #define USB_VENDOR_ID_BERKSHIRE 0x0c98 |
1382 | #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 | 1383 | #define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 |
@@ -1469,6 +1470,7 @@ static struct hid_blacklist { | |||
1469 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW48, HID_QUIRK_IGNORE }, | 1470 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW48, HID_QUIRK_IGNORE }, |
1470 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE }, | 1471 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28, HID_QUIRK_IGNORE }, |
1471 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE }, | 1472 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE }, |
1473 | { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE }, | ||
1472 | { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, | 1474 | { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, |
1473 | { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE }, | 1475 | { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20, HID_QUIRK_IGNORE }, |
1474 | { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, | 1476 | { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, |