platform/x86: msi-laptop: Fix resource cleanup

[ Upstream commit 41930648a02d3a06ffdf3941656a0478c7e1dedf ]

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: 428ef73009c9 ("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 0960205ee49f4bd3fa8dccd0e7d55e72eabfda7a..3e935303b1433075b24db67e2f590efc93ce5a8e 100644 (file)
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -1116,6 +1116,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();
@@ -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);