Skip to contentSkip to conversation

leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

PATCH Applied Cong Nguyen 3 participants 3 messages Sep 15 – Sep 22 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

Every write in lm3692x_leds_enable() checks its return and jumps to
out: on failure -- except the last one, which falls through and sets led->enabled = true regardless of whether it actually succeeded. Leaks the regulator on a failing probe, and short-circuits later brightness_set() calls without retrying.

Route it through out: like every other write here, and only set enabled = true once it succeeds.

Fixes 260718b3a35d ("leds: lm3692x: Disable chip on brightness 0")
Assisted-by Claude:claude-opus-4
---
 drivers/leds/leds-lm3692x.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/leds/leds-lm3692x.c +3 -1
index 8d2678dc9e4f..9c58d54c5783 100644
@@ -276,9 +276,11 @@ static int lm3692x_leds_enable(struct lm3692x_led *led)
 
 	ret = regmap_update_bits(led->regmap, LM3692X_EN, LM3692X_ENABLE_MASK,
 				 enable_state | LM3692X_DEVICE_EN);
+	if (ret)
+		goto out;
 
 	led->enabled = true;
-	return ret;
+	return 0;
 out:
 	dev_err(&led->client->dev, "Fail writing initialization values\n");
 
Signature · 1 line
2.25.1
#1 lore raw
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] leds: commit message description is not capitalized --

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] leds: commit message description is not capitalized
--

commit b25c5a499c39fb9de3dfd21fd5b2889e97d97b83
Author: Cong Nguyen <[email protected]>

leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

This commit addresses an error handling omission in lm3692x_leds_enable(), where the final write ignores its return value and marks the LED as enabled even on failure. Routing this through the standard error path prevents regulator leaks and ensures proper retry behavior.

Quoted 1 line

leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

[Severity: Low]
This isn't a bug, but does the commit subject violate the LED subsystem convention for capitalization? The subsystem guidelines require capitalizing the description after the prefix (e.g., "leds: lm3692x: Fix regulator...").

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer Applied
#2 lore raw

Re: (subset) [PATCH] leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

In reply to Cong Nguyen
Quoted 10 lines · Cong Nguyen

Every write in lm3692x_leds_enable() checks its return and jumps to
out: on failure -- except the last one, which falls through and sets led->enabled = true regardless of whether it actually succeeded. Leaks the regulator on a failing probe, and short-circuits later brightness_set() calls without retrying.

Route it through out: like every other write here, and only set enabled = true once it succeeds.

[...]

Applied, thanks!

[1/1] leds: lm3692x: fix regulator/gpio leak and wrong enabled state on last write failure

      commit: 145ca6bca2cc5fd8d9c7af216df58a9c75c0e84c

--
Lee Jones [李琼斯]