From d8692ac012104ebffb343c0bcb4a2b8642c821a6 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Sat, 23 Oct 2010 22:59:33 +0200 Subject: HID: fix mismerge in hid-lg Fix wrong merge in hid-lg -- report fixup functions now get pointer to rdesc. Signed-off-by: Jiri Kosina --- drivers/hid/hid-lg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/hid') diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 6d3cd7e5fa9..b629fba5a05 100644 --- 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 " -- cgit v1.2.3