Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1694239

[PATCH] HID: rmi: Make sure the HID device is opened on resume

Show all headers | View raw

So it looks like that suspend/resume has actually always been broken on
hid-rmi. The fact it worked was a rather silly coincidence that was
relying on the HID device to already be opened upon resume. This means
that so long as anything was reading the /dev/input/eventX node for for
an RMI device, it would suspend and resume correctly. As well, if
nothing happened to be keeping the HID device away it would shut off,
then the RMI driver would get confused on resume when it stopped
responding and explode.

So, call hid_hw_open() in rmi_post_resume() so we make sure that the
device is alive before we try talking to it.

This fixes RMI device suspend/resume over HID.

Signed-off-by: Lyude <lyude@redhat.com>
Cc: Andrew Duggan <aduggan@synaptics.com>
Cc: stable@vger.kernel.org
---
 drivers/hid/hid-rmi.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
index 5b40c2614599..e7d124f9a27f 100644
--- a/drivers/hid/hid-rmi.c
+++ b/drivers/hid/hid-rmi.c
@@ -431,22 +431,29 @@ static int rmi_post_resume(struct hid_device *hdev)
 {
 	struct rmi_data *data = hid_get_drvdata(hdev);
 	struct rmi_device *rmi_dev = data->xport.rmi_dev;
-	int ret;
+	int ret = 0;
 
 	if (!(data->device_flags & RMI_DEVICE))
 		return 0;
 
-	ret = rmi_reset_attn_mode(hdev);
+	/* Make sure the HID device is ready to receive events */
+	ret = hid_hw_open(hdev);
 	if (ret)
 		return ret;
 
+	ret = rmi_reset_attn_mode(hdev);
+	if (ret)
+		goto out;
+
 	ret = rmi_driver_resume(rmi_dev, false);
 	if (ret) {
 		hid_warn(hdev, "Failed to resume device: %d\n", ret);
-		return ret;
+		goto out;
 	}
 
-	return 0;
+out:
+	hid_hw_close(hdev);
+	return ret;
 }
 #endif /* CONFIG_PM */
 
-- 
2.13.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] HID: rmi: Make sure the HID device is opened on resume Lyude <lyude@redhat.com> - 2017-07-23 03:20 +0200
  Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-07-23 12:00 +0200
    Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Lyude Paul <lyude@redhat.com> - 2017-07-24 19:50 +0200
      Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Jiri Kosina <jikos@kernel.org> - 2017-07-24 21:30 +0200
        Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Lyude Paul <lyude@redhat.com> - 2017-07-24 21:50 +0200
  Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2017-07-24 10:20 +0200
    Re: [PATCH] HID: rmi: Make sure the HID device is opened on resume Lyude Paul <lyude@redhat.com> - 2017-07-24 20:00 +0200

csiph-web