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: 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>

diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 7279390a2d54df25a8bdd95a0e9baa162fcd96df..1ba5f4689df4de5bd245003acf7640ed0a784987 100644 (file)
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -1129,6 +1129,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);
                cancel_work_sync(&msi_rfkill_work);
                rfkill_cleanup();
@@ -1149,6 +1151,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);