qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platform/x86: msi-laptop: Fix resource cleanup 

[ 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: 143a4c0284 ("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>
This commit is contained in:
Hans de Goede 2022-08-25 16:13:36 +02:00 committed by Greg Kroah-Hartman
parent c21c08fab7
commit 804d8e59f3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/platform/x86/msi-laptop.c
View File

@ -1116,6 +1116,8 @@ fail_create_attr:
fail_create_group: fail_create_group:
if (quirks->load_scm_model) { if (quirks->load_scm_model) {
i8042_remove_filter(msi_laptop_i8042_filter); 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_delayed_work_sync(&msi_rfkill_dwork);
cancel_work_sync(&msi_rfkill_work); cancel_work_sync(&msi_rfkill_work);
rfkill_cleanup(); rfkill_cleanup();
@ -1136,6 +1138,7 @@ static void __exit msi_cleanup(void)
{ {
if (quirks->load_scm_model) { if (quirks->load_scm_model) {
i8042_remove_filter(msi_laptop_i8042_filter); i8042_remove_filter(msi_laptop_i8042_filter);
cancel_delayed_work_sync(&msi_touchpad_dwork);
input_unregister_device(msi_laptop_input_dev); input_unregister_device(msi_laptop_input_dev);
cancel_delayed_work_sync(&msi_rfkill_dwork); cancel_delayed_work_sync(&msi_rfkill_dwork);
cancel_work_sync(&msi_rfkill_work); cancel_work_sync(&msi_rfkill_work);