diff options
Diffstat (limited to 'drivers/hid/hid-lg.c')
-rw-r--r-- | drivers/hid/hid-lg.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index b629fba5a057..aef4104da141 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
@@ -53,23 +53,22 @@ static __u8 *lg_report_fixup(struct hid_device *hdev, __u8 *rdesc, | |||
53 | 53 | ||
54 | if ((quirks & LG_RDESC) && *rsize >= 90 && rdesc[83] == 0x26 && | 54 | if ((quirks & LG_RDESC) && *rsize >= 90 && rdesc[83] == 0x26 && |
55 | rdesc[84] == 0x8c && rdesc[85] == 0x02) { | 55 | rdesc[84] == 0x8c && rdesc[85] == 0x02) { |
56 | dev_info(&hdev->dev, "fixing up Logitech keyboard report " | 56 | hid_info(hdev, |
57 | "descriptor\n"); | 57 | "fixing up Logitech keyboard report descriptor\n"); |
58 | rdesc[84] = rdesc[89] = 0x4d; | 58 | rdesc[84] = rdesc[89] = 0x4d; |
59 | rdesc[85] = rdesc[90] = 0x10; | 59 | rdesc[85] = rdesc[90] = 0x10; |
60 | } | 60 | } |
61 | if ((quirks & LG_RDESC_REL_ABS) && *rsize >= 50 && | 61 | if ((quirks & LG_RDESC_REL_ABS) && *rsize >= 50 && |
62 | rdesc[32] == 0x81 && rdesc[33] == 0x06 && | 62 | rdesc[32] == 0x81 && rdesc[33] == 0x06 && |
63 | rdesc[49] == 0x81 && rdesc[50] == 0x06) { | 63 | rdesc[49] == 0x81 && rdesc[50] == 0x06) { |
64 | dev_info(&hdev->dev, "fixing up rel/abs in Logitech " | 64 | hid_info(hdev, |
65 | "report descriptor\n"); | 65 | "fixing up rel/abs in Logitech 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 | hid_info(hdev, "fixing up Logitech Speed Force Wireless button descriptor\n"); |
72 | "button descriptor\n"); | ||
73 | rdesc[41] = 0x05; | 72 | rdesc[41] = 0x05; |
74 | rdesc[42] = 0x09; | 73 | rdesc[42] = 0x09; |
75 | rdesc[47] = 0x95; | 74 | rdesc[47] = 0x95; |
@@ -288,7 +287,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
288 | 287 | ||
289 | ret = hid_parse(hdev); | 288 | ret = hid_parse(hdev); |
290 | if (ret) { | 289 | if (ret) { |
291 | dev_err(&hdev->dev, "parse failed\n"); | 290 | hid_err(hdev, "parse failed\n"); |
292 | goto err_free; | 291 | goto err_free; |
293 | } | 292 | } |
294 | 293 | ||
@@ -297,7 +296,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) | |||
297 | 296 | ||
298 | ret = hid_hw_start(hdev, connect_mask); | 297 | ret = hid_hw_start(hdev, connect_mask); |
299 | if (ret) { | 298 | if (ret) { |
300 | dev_err(&hdev->dev, "hw start failed\n"); | 299 | hid_err(hdev, "hw start failed\n"); |
301 | goto err_free; | 300 | goto err_free; |
302 | } | 301 | } |
303 | 302 | ||