diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2022-08-25 16:13:36 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2022-08-26 12:59:47 +0200 |
| commit | 5523632aa10f906dfe2eb714ee748590dc7fc6b1 (patch) | |
| tree | 7bdb474be75c7d8e66b01281736b54301e8778b1 /drivers/platform | |
| parent | platform/x86: msi-laptop: Simplify ec_delay handling (diff) | |
| download | wireguard-linux-5523632aa10f906dfe2eb714ee748590dc7fc6b1.tar.xz wireguard-linux-5523632aa10f906dfe2eb714ee748590dc7fc6b1.zip | |
platform/x86: msi-laptop: Fix resource cleanup
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
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 65db18c6e3e8..5d4b10b8d771 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -1106,6 +1106,8 @@ fail_create_attr: 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); rfkill_cleanup(); } @@ -1125,6 +1127,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); rfkill_cleanup(); |