[PATCH 3/3] HID: wiimote: use scoped cleanup in led creation
From: Rafael Passos <hidden>
Date: 2026-07-10 15:35:55
Subsystem:
hid core layer, the rest, wiimote hid driver · Maintainers:
Jiri Kosina, Benjamin Tissoires, Linus Torvalds, David Rheinsberg
Cleanup code in led probe function, using the modern scoped cleanup. This prevents mistakes in future changes to this function. Signed-off-by: Rafael Passos <redacted> --- drivers/hid/hid-wiimote-modules.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c
index f42f9aa7b2d4..7c305099c82d 100644
--- a/drivers/hid/hid-wiimote-modules.c
+++ b/drivers/hid/hid-wiimote-modules.c@@ -340,11 +340,11 @@ static int wiimod_led_probe(const struct wiimod_ops *ops, { struct device *dev = &wdata->hdev->dev; size_t namesz = strlen(dev_name(dev)) + 9; - struct led_classdev *led; char *name; int ret; - led = kzalloc(sizeof(struct led_classdev) + namesz, GFP_KERNEL); + struct led_classdev *led __free(kfree) = + kzalloc(sizeof(struct led_classdev) + namesz, GFP_KERNEL); if (!led) return -ENOMEM;
@@ -358,8 +358,13 @@ static int wiimod_led_probe(const struct wiimod_ops *ops, wdata->leds[ops->arg] = led; ret = led_classdev_register(dev, led); - if (ret) - goto err_free; + if (ret) { + wdata->leds[ops->arg] = NULL; + return ret; + } + + /* Ownership transferred to wdata – prevent cleanup from freeing */ + led = NULL; /* enable LED1 to stop initial LED-blinking */ if (ops->arg == 0) {
@@ -368,11 +373,6 @@ static int wiimod_led_probe(const struct wiimod_ops *ops, } return 0; - -err_free: - wdata->leds[ops->arg] = NULL; - kfree(led); - return ret; } static void wiimod_led_remove(const struct wiimod_ops *ops,
--
2.53.0