diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:49:32 +0200 |
commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
tree | ff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/hid-elecom.c | |
parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
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 @@ #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; } + return rdesc; } static const struct hid_device_id elecom_devices[] = { |