Skip to content

Commit

Permalink
Merge branch 'for-6.2/rmi' into for-linus
Browse files Browse the repository at this point in the history
- wakeup event handling fix for RMI driver (Dmitry Torokhov)
  • Loading branch information
Jiri Kosina committed Dec 13, 2022
2 parents 9a6f62b + 9984fbf commit 54dcc80
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/hid/hid-rmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
if (!(test_bit(RMI_STARTED, &hdata->flags)))
return 0;

pm_wakeup_event(hdev->dev.parent, 0);

local_irq_save(flags);

rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);
Expand Down
3 changes: 2 additions & 1 deletion drivers/hid/i2c-hid/i2c-hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,8 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)
i2c_hid_dbg(ihid, "input: %*ph\n", ret_size, ihid->inbuf);

if (test_bit(I2C_HID_STARTED, &ihid->flags)) {
pm_wakeup_event(&ihid->client->dev, 0);
if (ihid->hid->group != HID_GROUP_RMI)
pm_wakeup_event(&ihid->client->dev, 0);

hid_input_report(ihid->hid, HID_INPUT_REPORT,
ihid->inbuf + sizeof(__le16),
Expand Down

0 comments on commit 54dcc80

Please sign in to comment.