Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 54dcc80e 编写于 作者: J Jiri Kosina
浏览文件
操作

Merge branch 'for-6.2/rmi' into for-linus 

- wakeup event handling fix for RMI driver (Dmitry Torokhov)
上级 9a6f62b5 9984fbf5
隐藏空白更改
内联 并排
Showing with 4 addition and 1 deletion
drivers/hid/hid-rmi.c
浏览文件 @ 54dcc80e
...@@ -326,6 +326,8 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size) ...@@ -326,6 +326,8 @@ static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
if (!(test_bit(RMI_STARTED, &hdata->flags))) if (!(test_bit(RMI_STARTED, &hdata->flags)))
return 0; return 0;
pm_wakeup_event(hdev->dev.parent, 0);
local_irq_save(flags); local_irq_save(flags);
rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2); rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);
......
drivers/hid/i2c-hid/i2c-hid-core.c
浏览文件 @ 54dcc80e
...@@ -554,7 +554,8 @@ static void i2c_hid_get_input(struct i2c_hid *ihid) ...@@ -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); i2c_hid_dbg(ihid, "input: %*ph\n", ret_size, ihid->inbuf);
if (test_bit(I2C_HID_STARTED, &ihid->flags)) { 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, hid_input_report(ihid->hid, HID_INPUT_REPORT,
ihid->inbuf + sizeof(__le16), ihid->inbuf + sizeof(__le16),
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或