diff options
| author | Nikolai Kondrashov <spbnick@gmail.com> | 2010-08-06 21:03:06 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-09 19:52:42 +0200 |
| commit | 73e4008ddddc84d5f2499c17012b340a0dae153e (patch) | |
| tree | d3adfa8c5792e71c21cb7a9cd18517cce9c92685 /drivers/hid/hid-sunplus.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... (diff) | |
| download | linux-73e4008ddddc84d5f2499c17012b340a0dae153e.tar.xz linux-73e4008ddddc84d5f2499c17012b340a0dae153e.zip | |
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-sunplus.c')
| -rw-r--r-- | drivers/hid/hid-sunplus.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c index 438107d9f1b2..164ed568f6cf 100644 --- a/drivers/hid/hid-sunplus.c +++ b/drivers/hid/hid-sunplus.c @@ -22,16 +22,17 @@ #include "hid-ids.h" -static void sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int rsize) +static __u8 *sp_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) { - if (rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 && + if (*rsize >= 107 && rdesc[104] == 0x26 && rdesc[105] == 0x80 && rdesc[106] == 0x03) { dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop " "report descriptor\n"); rdesc[105] = rdesc[110] = 0x03; rdesc[106] = rdesc[111] = 0x21; } + return rdesc; } #define sp_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ |