aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.de>2007-01-11 04:14:33 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2007-01-22 14:55:16 -0500
commit8d2bad8788a6f968247df409f50c757b1a5489f4 (patch)
tree01133182dbda35e7b5deec5a607d2d62174e2f6d /drivers/usb/input
parentdeb31f1764e0a11bcfe8d44e0658f83d83860e84 (diff)
USB: make usbhid ignore Imation Disc Stakka
on request of the sourceforge project for this device, a kind of robotized CD storage, it should be ignored by the generic driver. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hid-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 6e739efee6f7..ea3636d96e1b 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -796,6 +796,9 @@ void usbhid_init_reports(struct hid_device *hid)
796#define USB_VENDOR_ID_LOGITECH 0x046d 796#define USB_VENDOR_ID_LOGITECH 0x046d
797#define USB_DEVICE_ID_LOGITECH_USB_RECEIVER 0xc101 797#define USB_DEVICE_ID_LOGITECH_USB_RECEIVER 0xc101
798 798
799#define USB_VENDOR_ID_IMATION 0x0718
800#define USB_DEVICE_ID_DISC_STAKKA 0xd000
801
799/* 802/*
800 * Alphabetically sorted blacklist by quirk type. 803 * Alphabetically sorted blacklist by quirk type.
801 */ 804 */
@@ -883,6 +886,7 @@ static const struct hid_blacklist {
883 { USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE }, 886 { USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },
884 { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE }, 887 { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },
885 { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE }, 888 { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },
889 { USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },
886 { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE }, 890 { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
887 { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE }, 891 { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
888 { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE }, 892 { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },