diff options
author | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2011-03-16 13:13:53 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-03-16 19:32:42 -0400 |
commit | 270fdc0748bd3f7b625caff985f2fcf8e2185ec7 (patch) | |
tree | 5c454f258ec760835e104ce561e9303269a59d26 /drivers/hid | |
parent | 2d9ca4e9f393d81d8f37ed37505aecbf3a5e1bd6 (diff) |
HID: add support for Ortek PKB-1700
As reported on http://ubuntuforums.org/showthread.php?t=1594007 the
PKB-1700 needs same special handling as WKB-2000. This change is
originally based on patch posted by user asmoore82 on the Ubuntu
forums.
Cc: stable@kernel.org
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/Kconfig | 4 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ortek.c | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 24cca2f69dfc..51a598bfd709 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -319,10 +319,10 @@ config HID_NTRIG | |||
319 | Support for N-Trig touch screen. | 319 | Support for N-Trig touch screen. |
320 | 320 | ||
321 | config HID_ORTEK | 321 | config HID_ORTEK |
322 | tristate "Ortek WKB-2000 wireless keyboard and mouse trackpad" | 322 | tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad" |
323 | depends on USB_HID | 323 | depends on USB_HID |
324 | ---help--- | 324 | ---help--- |
325 | Support for Ortek WKB-2000 wireless keyboard + mouse trackpad. | 325 | Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad. |
326 | 326 | ||
327 | config HID_PANTHERLORD | 327 | config HID_PANTHERLORD |
328 | tristate "Pantherlord/GreenAsia game controller" | 328 | tristate "Pantherlord/GreenAsia game controller" |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d678cf3d33d5..295e2487102b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1400,6 +1400,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1400 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) }, | 1400 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) }, |
1401 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) }, | 1401 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) }, |
1402 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, | 1402 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, |
1403 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, | ||
1403 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, | 1404 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, |
1404 | { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, | 1405 | { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, |
1405 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, | 1406 | { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 92a0d61a7379..5f5cc9100aff 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -466,6 +466,7 @@ | |||
466 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 | 466 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 |
467 | 467 | ||
468 | #define USB_VENDOR_ID_ORTEK 0x05a4 | 468 | #define USB_VENDOR_ID_ORTEK 0x05a4 |
469 | #define USB_DEVICE_ID_ORTEK_PKB1700 0x1700 | ||
469 | #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 | 470 | #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 |
470 | 471 | ||
471 | #define USB_VENDOR_ID_PANJIT 0x134c | 472 | #define USB_VENDOR_ID_PANJIT 0x134c |
diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c index e90edfc63051..ad6faa6c0cea 100644 --- a/drivers/hid/hid-ortek.c +++ b/drivers/hid/hid-ortek.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad). | 2 | * HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad). |
3 | * Fixes LogicalMaximum error in USB report description, see | 3 | * Fixes LogicalMaximum error in USB report description, see |
4 | * http://bugzilla.kernel.org/show_bug.cgi?id=14787 | 4 | * http://bugzilla.kernel.org/show_bug.cgi?id=14787 |
5 | * | 5 | * |
@@ -30,6 +30,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
30 | } | 30 | } |
31 | 31 | ||
32 | static const struct hid_device_id ortek_devices[] = { | 32 | static const struct hid_device_id ortek_devices[] = { |
33 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, | ||
33 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, | 34 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, |
34 | { } | 35 | { } |
35 | }; | 36 | }; |