diff options
| -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 | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 6fd01a692197..9017dcc14502 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -2216,6 +2216,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
| 2216 | #if IS_ENABLED(CONFIG_HID_ORTEK) | 2216 | #if IS_ENABLED(CONFIG_HID_ORTEK) |
| 2217 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, | 2217 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, |
| 2218 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, | 2218 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, |
| 2219 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S) }, | ||
| 2219 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, | 2220 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, |
| 2220 | #endif | 2221 | #endif |
| 2221 | #if IS_ENABLED(CONFIG_HID_PANTHERLORD) | 2222 | #if IS_ENABLED(CONFIG_HID_PANTHERLORD) |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3d911bfd91cf..c9ba4c6db74c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -824,6 +824,7 @@ | |||
| 824 | #define USB_VENDOR_ID_ORTEK 0x05a4 | 824 | #define USB_VENDOR_ID_ORTEK 0x05a4 |
| 825 | #define USB_DEVICE_ID_ORTEK_PKB1700 0x1700 | 825 | #define USB_DEVICE_ID_ORTEK_PKB1700 0x1700 |
| 826 | #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 | 826 | #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 |
| 827 | #define USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S 0x8003 | ||
| 827 | 828 | ||
| 828 | #define USB_VENDOR_ID_PLANTRONICS 0x047f | 829 | #define USB_VENDOR_ID_PLANTRONICS 0x047f |
| 829 | 830 | ||
diff --git a/drivers/hid/hid-ortek.c b/drivers/hid/hid-ortek.c index 6620f15fec22..8783a064cdcf 100644 --- a/drivers/hid/hid-ortek.c +++ b/drivers/hid/hid-ortek.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Ortek PKB-1700 | 6 | * Ortek PKB-1700 |
| 7 | * Ortek WKB-2000 | 7 | * Ortek WKB-2000 |
| 8 | * iHome IMAC-A210S | ||
| 8 | * Skycable wireless presenter | 9 | * Skycable wireless presenter |
| 9 | * | 10 | * |
| 10 | * Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com> | 11 | * Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com> |
| @@ -28,10 +29,10 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
| 28 | unsigned int *rsize) | 29 | unsigned int *rsize) |
| 29 | { | 30 | { |
| 30 | if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) { | 31 | if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x01) { |
| 31 | hid_info(hdev, "Fixing up logical minimum in report descriptor (Ortek)\n"); | 32 | hid_info(hdev, "Fixing up logical maximum in report descriptor (Ortek)\n"); |
| 32 | rdesc[55] = 0x92; | 33 | rdesc[55] = 0x92; |
| 33 | } else if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) { | 34 | } else if (*rsize >= 54 && rdesc[52] == 0x25 && rdesc[53] == 0x01) { |
| 34 | hid_info(hdev, "Fixing up logical minimum in report descriptor (Skycable)\n"); | 35 | hid_info(hdev, "Fixing up logical maximum in report descriptor (Skycable)\n"); |
| 35 | rdesc[53] = 0x65; | 36 | rdesc[53] = 0x65; |
| 36 | } | 37 | } |
| 37 | return rdesc; | 38 | return rdesc; |
| @@ -40,6 +41,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
| 40 | static const struct hid_device_id ortek_devices[] = { | 41 | static const struct hid_device_id ortek_devices[] = { |
| 41 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, | 42 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, |
| 42 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, | 43 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, |
| 44 | { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S) }, | ||
| 43 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, | 45 | { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) }, |
| 44 | { } | 46 | { } |
| 45 | }; | 47 | }; |
