projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f127541
)
HID: fix mismerge in hid-lg
author
Jiri Kosina
<jkosina@suse.cz>
Sat, 23 Oct 2010 20:59:33 +0000
(22:59 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Sat, 23 Oct 2010 20:59:33 +0000
(22:59 +0200)
Fix wrong merge in hid-lg -- report fixup functions now get
pointer to rdesc.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-lg.c
patch
|
blob
|
history
diff --git
a/drivers/hid/hid-lg.c
b/drivers/hid/hid-lg.c
index 6d3cd7e5fa91c40e41461e892cc98f28e1c027b1..b629fba5a05757c5743fc9cfa06d69280b3173ef 100644
(file)
--- a/
drivers/hid/hid-lg.c
+++ b/
drivers/hid/hid-lg.c
@@
-65,7
+65,7
@@
static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
"report descriptor\n");
rdesc[33] = rdesc[50] = 0x02;
}
- if ((quirks & LG_FF4) && rsize >= 101 &&
+ if ((quirks & LG_FF4) &&
*
rsize >= 101 &&
rdesc[41] == 0x95 && rdesc[42] == 0x0B &&
rdesc[47] == 0x05 && rdesc[48] == 0x09) {
dev_info(&hdev->dev, "fixing up Logitech Speed Force Wireless "