Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a367b7a9 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

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: 143a4c02 ("msi-laptop: send out touchpad on/off key")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220825141336.208597-3-hdegoede@redhat.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a9b32c9f

drivers/platform/x86/msi-laptop.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1116,6 +1116,8 @@ static int __init msi_init(void) 
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);