On 11/18/2024 22:35, Kurt Borja wrote:
Propagate led_classdev_register return value in case of error.
Call led_classdev_unregister in case sysfs_create_group fails.
If alienware_zone_init fails, alienware_zone_exit should not be called
because the latter unregisters/removes the led class and the sysfs
group, which may not be registered/created if the former failed
prematurely.
Signed-off-by: Kurt Borja <kuurtb@xxxxxxxxx>
---
drivers/platform/x86/dell/alienware-wmi.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
index 980ffc545093..44f1f7b57d0a 100644
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@ -628,6 +628,7 @@ static int alienware_zone_init(struct platform_device *pdev)
char *name;
struct device_attribute *zone_dev_attrs;
struct attribute **zone_attrs;
+ int ret;
if (interface == WMAX) {
lighting_control_state = WMAX_RUNNING;
@@ -675,9 +676,19 @@ static int alienware_zone_init(struct platform_device *pdev)
zone_attrs[quirks->num_zones] = &dev_attr_lighting_control_state.attr;
zone_attribute_group.attrs = zone_attrs;
- led_classdev_register(&pdev->dev, &global_led);
+ ret = led_classdev_register(&pdev->dev, &global_led);
How about switching to the devm version of led_classdev_register instead
so you can keep a simpler cleanup?
+ if (ret < 0)
+ return ret;
+
+ ret = sysfs_create_group(&pdev->dev.kobj, &zone_attribute_group);
+ if (ret < 0)
+ goto fail_prep_zone_group;
+
+ return 0;
- return sysfs_create_group(&pdev->dev.kobj, &zone_attribute_group);
+fail_prep_zone_group:
+ led_classdev_unregister(&global_led);
+ return ret;
}
static void alienware_zone_exit(struct platform_device *dev)
@@ -1223,7 +1234,6 @@ static int __init alienware_wmi_init(void)
return 0;
fail_prep_zones:
- alienware_zone_exit(platform_device);
remove_thermal_profile();
fail_prep_thermal_profile:
fail_prep_deepsleep:
