aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Cattiau <remi@cattiau.com>2008-09-08 19:39:33 -0400
committerJiri Kosina <jkosina@suse.cz>2008-10-14 17:50:59 -0400
commitd1d3a5f6eaee337d793ab9ac28e696f0262c3c8a (patch)
tree6152ca45da1f4f9eb594f5e904a87819ece7f768
parent1f934451825f8cfefd97e4eab4d1ab2f6591ec0f (diff)
HID: ignore iBuddy devices
iBuddy devices claim to be HID devices, but they are not. Add them to the blacklist. Signed-off-by: Remi Cattiau <remi@cattiau.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-core.c2
-rw-r--r--drivers/hid/hid-ids.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 798bb0a866f0..18b277a833f0 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1512,6 +1512,8 @@ static const struct hid_device_id hid_ignore_list[] = {
1512 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) }, 1512 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },
1513 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) }, 1513 { HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },
1514 { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) }, 1514 { HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },
1515 { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },
1516 { HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },
1515 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) }, 1517 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
1516 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) }, 1518 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },
1517 { HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) }, 1519 { 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 0784a09f5adb..fa4e4fd96f65 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -351,6 +351,10 @@
351#define USB_VENDOR_ID_SUNPLUS 0x04fc 351#define USB_VENDOR_ID_SUNPLUS 0x04fc
352#define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8 352#define USB_DEVICE_ID_SUNPLUS_WDESKTOP 0x05d8
353 353
354#define USB_VENDOR_ID_TENX 0x1130
355#define USB_DEVICE_ID_TENX_IBUDDY1 0x0001
356#define USB_DEVICE_ID_TENX_IBUDDY2 0x0002
357
354#define USB_VENDOR_ID_TOPMAX 0x0663 358#define USB_VENDOR_ID_TOPMAX 0x0663
355#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103 359#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
356 360