From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 23 Oct 2010 20:59:33 +0000 (+0200)
Subject: HID: fix mismerge in hid-lg
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d8692ac012104ebffb343c0bcb4a2b8642c821a6;p=openwrt%2Fstaging%2Fblogic.git

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 <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 6d3cd7e5fa91..b629fba5a057 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 "