aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-23 08:13:46 -0500
committerJiri Kosina <jkosina@suse.cz>2010-01-13 06:00:43 -0500
commit4bb9508bbbb06f10bc3e249dd34375b4a4d6bfc0 (patch)
tree6c717f0856598097176c1127de7070be8d4b8451 /drivers/hid
parent49e4739a0cf681cbfe08c72232c1dcc130b66dde (diff)
HID: remove TENX iBuddy from blacklist
There were multiple reports which indicate that vendor messed up horribly and the same VID/PID combination is used for completely different devices, some of them requiring the blacklist entry and other not. Remove the blacklist entry for this combination of VID/PID completely, and let the user decide and unbind the driver via sysfs eventually, if needed. Proper fix would be fixing the vendor. References: http://lkml.org/lkml/2009/2/10/434 http://bugzilla.kernel.org/show_bug.cgi?id=13411 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-core.c2
-rw-r--r--drivers/hid/hid-ids.h4
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 056384cf05e4..116a3460e75a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1662,8 +1662,6 @@ static const struct hid_device_id hid_ignore_list[] = {
1662 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, 1662 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
1663 { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) }, 1663 { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE) },
1664 { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) }, 1664 { HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },
1665 { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
1666 { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
1667 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) }, 1665 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
1668 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) }, 1666 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
1669 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) }, 1667 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b009fd68deae..064c09a221ef 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -406,10 +406,6 @@
406#define USB_VENDOR_ID_SUNPLUS 0x04fc 406#define USB_VENDOR_ID_SUNPLUS 0x04fc
407#define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8 407#define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8
408 408
409#define USB_VENDOR_ID_TENX 0x1130
410#define USB_DEVICE_ID_TENX_IBUDDY1 0x0001
411#define USB_DEVICE_ID_TENX_IBUDDY2 0x0002
412
413#define USB_VENDOR_ID_THRUSTMASTER 0x044f 409#define USB_VENDOR_ID_THRUSTMASTER 0x044f
414 410
415#define USB_VENDOR_ID_TOPMAX 0x0663 411#define USB_VENDOR_ID_TOPMAX 0x0663