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-petalynx.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-petalynx.c')
| -rw-r--r-- | drivers/hid/hid-petalynx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/hid-petalynx.c b/drivers/hid/hid-petalynx.c index 500fbd0652d..308d6ae48a3 100644 --- a/drivers/hid/hid-petalynx.c +++ b/drivers/hid/hid-petalynx.c @@ -23,10 +23,10 @@ #include "hid-ids.h" /* Petalynx Maxter Remote has maximum for consumer page set too low */ -static void pl_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int rsize) +static __u8 *pl_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) { - if (rsize >= 60 && rdesc[39] == 0x2a && rdesc[40] == 0xf5 && + if (*rsize >= 60 && rdesc[39] == 0x2a && rdesc[40] == 0xf5 && rdesc[41] == 0x00 && rdesc[59] == 0x26 && rdesc[60] == 0xf9 && rdesc[61] == 0x00) { dev_info(&hdev->dev, "fixing up Petalynx Maxter Remote report " @@ -34,6 +34,7 @@ static void pl_report_fixup(struct hid_device *hdev, __u8 *rdesc, rdesc[60] = 0xfa; rdesc[40] = 0xfa; } + return rdesc; } #define pl_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ |