Skip to content

Commit 54dcc80

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.2/rmi' into for-linus
- wakeup event handling fix for RMI driver (Dmitry Torokhov)
2 parents 9a6f62b + 9984fbf commit 54dcc80

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/hid/hid-rmi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
326326
if (!(test_bit(RMI_STARTED, &hdata->flags)))
327327
return 0;
328328

329+
pm_wakeup_event(hdev->dev.parent, 0);
330+
329331
local_irq_save(flags);
330332

331333
rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);

drivers/hid/i2c-hid/i2c-hid-core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,8 @@ static void i2c_hid_get_input(struct i2c_hid *ihid)
554554
i2c_hid_dbg(ihid, "input: %*ph\n", ret_size, ihid->inbuf);
555555

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

559560
hid_input_report(ihid->hid, HID_INPUT_REPORT,
560561
ihid->inbuf + sizeof(__le16),

0 commit comments

Comments
 (0)