Commit 54dcc80e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- wakeup event handling fix for RMI driver (Dmitry Torokhov)
parents 9a6f62b5 9984fbf5

drivers/hid/hid-rmi.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

+2 −1
Original line number Original line Diff line number Diff line
@@ -554,6 +554,7 @@ 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)) {

		if (ihid->hid->group != HID_GROUP_RMI)

			pm_wakeup_event(&ihid->client->dev, 0);

			pm_wakeup_event(&ihid->client->dev, 0);





		hid_input_report(ihid->hid, HID_INPUT_REPORT,

		hid_input_report(ihid->hid, HID_INPUT_REPORT,