lkml.org 
[lkml]   [2017]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.13 128/160] HID: rmi: Make sure the HID device is opened on resume
    Date
    4.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lyude <lyude@redhat.com>

    commit cac72b990d34f4c70208998a86f910ba38253c94 upstream.

    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.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=196851
    [jkosina@suse.cz: removed useless hunk that was zero-initializing 'ret']
    Signed-off-by: Lyude <lyude@redhat.com>
    Cc: Andrew Duggan <aduggan@synaptics.com>
    Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/hid/hid-rmi.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    --- a/drivers/hid/hid-rmi.c
    +++ b/drivers/hid/hid-rmi.c
    @@ -436,17 +436,24 @@ static int rmi_post_resume(struct hid_de
    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 */


    \
     
     \ /
      Last update: 2017-10-10 22:16    [W:4.105 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site