Skip to content

Commit a083a53

Browse files
author
Jiri Kosina
committed
Merge branch 'for-4.18/rmi' into for-linus
RMI4 correct split report handling from Benjamin Tissoires
2 parents d06e56c + c94ba06 commit a083a53

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

drivers/hid/hid-rmi.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,24 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
413413
return 0;
414414
}
415415

416+
static void rmi_report(struct hid_device *hid, struct hid_report *report)
417+
{
418+
struct hid_field *field = report->field[0];
419+
420+
if (!(hid->claimed & HID_CLAIMED_INPUT))
421+
return;
422+
423+
switch (report->id) {
424+
case RMI_READ_DATA_REPORT_ID:
425+
/* fall-through */
426+
case RMI_ATTN_REPORT_ID:
427+
return;
428+
}
429+
430+
if (field && field->hidinput && field->hidinput->input)
431+
input_sync(field->hidinput->input);
432+
}
433+
416434
#ifdef CONFIG_PM
417435
static int rmi_suspend(struct hid_device *hdev, pm_message_t message)
418436
{
@@ -637,6 +655,7 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
637655
hid_set_drvdata(hdev, data);
638656

639657
hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS;
658+
hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
640659

641660
ret = hid_parse(hdev);
642661
if (ret) {
@@ -744,6 +763,7 @@ static struct hid_driver rmi_driver = {
744763
.remove = rmi_remove,
745764
.event = rmi_event,
746765
.raw_event = rmi_raw_event,
766+
.report = rmi_report,
747767
.input_mapping = rmi_input_mapping,
748768
.input_configured = rmi_input_configured,
749769
#ifdef CONFIG_PM

0 commit comments

Comments
 (0)