Skip to content

Commit

Permalink
Merge branch 'for-4.18/rmi' into for-linus
Browse files Browse the repository at this point in the history
RMI4 correct split report handling from Benjamin Tissoires
  • Loading branch information
Jiri Kosina committed Jun 8, 2018
2 parents d06e56c + c94ba06 commit a083a53
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions drivers/hid/hid-rmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,24 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
return 0;
}

static void rmi_report(struct hid_device *hid, struct hid_report *report)
{
struct hid_field *field = report->field[0];

if (!(hid->claimed & HID_CLAIMED_INPUT))
return;

switch (report->id) {
case RMI_READ_DATA_REPORT_ID:
/* fall-through */
case RMI_ATTN_REPORT_ID:
return;
}

if (field && field->hidinput && field->hidinput->input)
input_sync(field->hidinput->input);
}

#ifdef CONFIG_PM
static int rmi_suspend(struct hid_device *hdev, pm_message_t message)
{
Expand Down Expand Up @@ -637,6 +655,7 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
hid_set_drvdata(hdev, data);

hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS;
hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;

ret = hid_parse(hdev);
if (ret) {
Expand Down Expand Up @@ -744,6 +763,7 @@ static struct hid_driver rmi_driver = {
.remove = rmi_remove,
.event = rmi_event,
.raw_event = rmi_raw_event,
.report = rmi_report,
.input_mapping = rmi_input_mapping,
.input_configured = rmi_input_configured,
#ifdef CONFIG_PM
Expand Down

0 comments on commit a083a53

Please sign in to comment.