diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:59:33 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 22:59:33 +0200 |
| commit | d8692ac012104ebffb343c0bcb4a2b8642c821a6 (patch) | |
| tree | f55eea6bfbdcdf4f692f6eb9c8f0741b057272b1 /drivers | |
| parent | f1275410a108ac38b59149d10bce3f35edd70876 (diff) | |
| download | lwn-d8692ac012104ebffb343c0bcb4a2b8642c821a6.tar.gz lwn-d8692ac012104ebffb343c0bcb4a2b8642c821a6.zip | |
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')
| -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, "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 " |