lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 153/390] platform/x86: msi-laptop: Fix resource cleanup
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ Upstream commit 5523632aa10f906dfe2eb714ee748590dc7fc6b1 ]

    Fix the input-device not getting free-ed on probe-errors and
    fix the msi_touchpad_dwork not getting cancelled on neither
    probe-errors nor on remove.

    Fixes: 143a4c0284dc ("msi-laptop: send out touchpad on/off key")
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20220825141336.208597-3-hdegoede@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/x86/msi-laptop.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
    index 0960205ee49f..3e935303b143 100644
    --- a/drivers/platform/x86/msi-laptop.c
    +++ b/drivers/platform/x86/msi-laptop.c
    @@ -1116,6 +1116,8 @@ static int __init msi_init(void)
    fail_create_group:
    if (quirks->load_scm_model) {
    i8042_remove_filter(msi_laptop_i8042_filter);
    + cancel_delayed_work_sync(&msi_touchpad_dwork);
    + input_unregister_device(msi_laptop_input_dev);
    cancel_delayed_work_sync(&msi_rfkill_dwork);
    cancel_work_sync(&msi_rfkill_work);
    rfkill_cleanup();
    @@ -1136,6 +1138,7 @@ static void __exit msi_cleanup(void)
    {
    if (quirks->load_scm_model) {
    i8042_remove_filter(msi_laptop_i8042_filter);
    + cancel_delayed_work_sync(&msi_touchpad_dwork);
    input_unregister_device(msi_laptop_input_dev);
    cancel_delayed_work_sync(&msi_rfkill_dwork);
    cancel_work_sync(&msi_rfkill_work);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 15:17    [W:7.867 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site