git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
hid
/
hid-sunplus.c
diff --git
a/drivers/hid/hid-sunplus.c
b/drivers/hid/hid-sunplus.c
index
438107d
..
d484a00
100644
(file)
--- a/
drivers/hid/hid-sunplus.c
+++ b/
drivers/hid/hid-sunplus.c
@@
-22,16
+22,16
@@
#include "hid-ids.h"
#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) {
rdesc[106] == 0x03) {
- dev_info(&hdev->dev, "fixing up Sunplus Wireless Desktop "
- "report descriptor\n");
+ hid_info(hdev, "fixing up Sunplus Wireless Desktop report descriptor\n");
rdesc[105] = rdesc[110] = 0x03;
rdesc[106] = rdesc[111] = 0x21;
}
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, \
}
#define sp_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \