]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/x86: dell-laptop: fix missing cleanups in init error path
authorHaoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Tue, 9 Jun 2026 08:14:19 +0000 (16:14 +0800)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 10 Jun 2026 11:29:19 +0000 (14:29 +0300)
dell_init() initializes several resources after dell_setup_rfkill(),
including the optional touchpad LED, keyboard backlight LED, battery
hook, debugfs directory and dell-laptop notifier.

If a later LED or backlight registration fails, the error path only
tears down the battery hook and rfkill resources. This leaves the
notifier, debugfs directory, keyboard backlight LED and optional
touchpad LED registered after dell_init() returns an error.

Add the missing cleanup calls before tearing down rfkill.

Fixes: 9c656b07997f ("platform/x86: dell-*: Call new led hw_changed API on kbd brightness change")
Fixes: 037accfa14b2 ("dell-laptop: Add debugfs support")
Fixes: 2d8b90be4f1c ("dell-laptop: support Synaptics/Alps touchpad led")
Fixes: 6cff8d60aa0a ("platform: x86: dell-laptop: Add support for keyboard backlight")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Link: https://patch.msgid.link/20260609081419.1995169-1-lihaoxiang@isrc.iscas.ac.cn
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/dell/dell-laptop.c

index 7fc3bbb8c4a4041f322ffca0441f64b2229a0da8..89e85c7f7132adb3b0793d536196caaa519d7849 100644 (file)
@@ -2560,7 +2560,12 @@ fail_backlight:
        if (mute_led_registered)
                led_classdev_unregister(&mute_led_cdev);
 fail_led:
+       dell_laptop_unregister_notifier(&dell_laptop_notifier);
+       debugfs_remove_recursive(dell_laptop_dir);
        dell_battery_exit();
+       kbd_led_exit();
+       if (quirks && quirks->touchpad_led)
+               touchpad_led_exit();
        dell_cleanup_rfkill();
 fail_rfkill:
        platform_device_del(platform_device);