diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:59:33 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:59:33 -0400 |
| commit | d8692ac012104ebffb343c0bcb4a2b8642c821a6 (patch) | |
| tree | f55eea6bfbdcdf4f692f6eb9c8f0741b057272b1 /drivers/hid/hid-lg.c | |
| parent | f1275410a108ac38b59149d10bce3f35edd70876 (diff) | |
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>
Diffstat (limited to 'drivers/hid/hid-lg.c')
| -rw-r--r-- | drivers/hid/hid-lg.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 65 | "report descriptor\n"); | 65 | "report descriptor\n"); |
| 66 | rdesc[33] = rdesc[50] = 0x02; | 66 | rdesc[33] = rdesc[50] = 0x02; |
| 67 | } | 67 | } |
| 68 | if ((quirks & LG_FF4) && rsize >= 101 && | 68 | if ((quirks & LG_FF4) && *rsize >= 101 && |
| 69 | rdesc[41] == 0x95 && rdesc[42] == 0x0B && | 69 | rdesc[41] == 0x95 && rdesc[42] == 0x0B && |
| 70 | rdesc[47] == 0x05 && rdesc[48] == 0x09) { | 70 | rdesc[47] == 0x05 && rdesc[48] == 0x09) { |
| 71 | dev_info(&hdev->dev, "fixing up Logitech Speed Force Wireless " | 71 | dev_info(&hdev->dev, "fixing up Logitech Speed Force Wireless " |