diff options
Diffstat (limited to 'drivers/hid/hid-cherry.c')
| -rw-r--r-- | drivers/hid/hid-cherry.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c index 24663a8717b1..e880086c2311 100644 --- a/drivers/hid/hid-cherry.c +++ b/drivers/hid/hid-cherry.c | |||
| @@ -26,15 +26,16 @@ | |||
| 26 | * Cherry Cymotion keyboard have an invalid HID report descriptor, | 26 | * Cherry Cymotion keyboard have an invalid HID report descriptor, |
| 27 | * that needs fixing before we can parse it. | 27 | * that needs fixing before we can parse it. |
| 28 | */ | 28 | */ |
| 29 | static void ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, | 29 | static __u8 *ch_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
| 30 | unsigned int rsize) | 30 | unsigned int *rsize) |
| 31 | { | 31 | { |
| 32 | if (rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) { | 32 | if (*rsize >= 17 && rdesc[11] == 0x3c && rdesc[12] == 0x02) { |
| 33 | dev_info(&hdev->dev, "fixing up Cherry Cymotion report " | 33 | dev_info(&hdev->dev, "fixing up Cherry Cymotion report " |
| 34 | "descriptor\n"); | 34 | "descriptor\n"); |
| 35 | rdesc[11] = rdesc[16] = 0xff; | 35 | rdesc[11] = rdesc[16] = 0xff; |
| 36 | rdesc[12] = rdesc[17] = 0x03; | 36 | rdesc[12] = rdesc[17] = 0x03; |
| 37 | } | 37 | } |
| 38 | return rdesc; | ||
| 38 | } | 39 | } |
| 39 | 40 | ||
| 40 | #define ch_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ | 41 | #define ch_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ |
