提交 d8692ac0 编写于 作者: J Jiri Kosina

HID: fix mismerge in hid-lg

Fix wrong merge in hid-lg -- report fixup functions now get
pointer to rdesc.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 f1275410
...@@ -65,7 +65,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, ...@@ -65,7 +65,7 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc,
"report descriptor\n"); "report descriptor\n");
rdesc[33] = rdesc[50] = 0x02; rdesc[33] = rdesc[50] = 0x02;
} }
if ((quirks & LG_FF4) && rsize >= 101 && if ((quirks & LG_FF4) && *rsize >= 101 &&
rdesc[41] == 0x95 && rdesc[42] == 0x0B && rdesc[41] == 0x95 && rdesc[42] == 0x0B &&
rdesc[47] == 0x05 && rdesc[48] == 0x09) { rdesc[47] == 0x05 && rdesc[48] == 0x09) {
dev_info(&hdev->dev, "fixing up Logitech Speed Force Wireless " dev_info(&hdev->dev, "fixing up Logitech Speed Force Wireless "
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册