projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[cascardo/linux.git]
/
drivers
/
hid
/
hid-elecom.c
diff --git
a/drivers/hid/hid-elecom.c
b/drivers/hid/hid-elecom.c
index
7a40878
..
6e31f30
100644
(file)
--- a/
drivers/hid/hid-elecom.c
+++ b/
drivers/hid/hid-elecom.c
@@
-20,14
+20,15
@@
#include "hid-ids.h"
#include "hid-ids.h"
-static
void
elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
- unsigned int rsize)
+static
__u8 *
elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+ unsigned int
*
rsize)
{
{
- if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
+ if (
*
rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
dev_info(&hdev->dev, "Fixing up Elecom BM084 "
"report descriptor.\n");
rdesc[47] = 0x00;
}
dev_info(&hdev->dev, "Fixing up Elecom BM084 "
"report descriptor.\n");
rdesc[47] = 0x00;
}
+ return rdesc;
}
static const struct hid_device_id elecom_devices[] = {
}
static const struct hid_device_id elecom_devices[] = {