diff options
author | Nikolai Kondrashov <spbnick@gmail.com> | 2010-08-06 15:03:06 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-09 13:52:42 -0400 |
commit | 73e4008ddddc84d5f2499c17012b340a0dae153e (patch) | |
tree | d3adfa8c5792e71c21cb7a9cd18517cce9c92685 /drivers/hid/hid-elecom.c | |
parent | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (diff) |
HID: allow resizing and replacing report descriptors
Update hid_driver's report_fixup prototype to allow changing report
descriptor size and/or returning completely different report descriptor.
Update existing usage accordingly.
This is to give more freedom in descriptor fixup and to allow having a whole
fixed descriptor in the code for the sake of readability.
Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-elecom.c')
-rw-r--r-- | drivers/hid/hid-elecom.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c index 7a40878f46b4..6e31f305397d 100644 --- a/drivers/hid/hid-elecom.c +++ b/drivers/hid/hid-elecom.c | |||
@@ -20,14 +20,15 @@ | |||
20 | 20 | ||
21 | #include "hid-ids.h" | 21 | #include "hid-ids.h" |
22 | 22 | ||
23 | static void elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, | 23 | static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
24 | unsigned int rsize) | 24 | unsigned int *rsize) |
25 | { | 25 | { |
26 | if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) { | 26 | if (*rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) { |
27 | dev_info(&hdev->dev, "Fixing up Elecom BM084 " | 27 | dev_info(&hdev->dev, "Fixing up Elecom BM084 " |
28 | "report descriptor.\n"); | 28 | "report descriptor.\n"); |
29 | rdesc[47] = 0x00; | 29 | rdesc[47] = 0x00; |
30 | } | 30 | } |
31 | return rdesc; | ||
31 | } | 32 | } |
32 | 33 | ||
33 | static const struct hid_device_id elecom_devices[] = { | 34 | static const struct hid_device_id elecom_devices[] = { |