[PATCH v2 2/2] leds: tps6131x: Clear torch brightness cache on flash takeover
From: Jie Gu
Date: Fri Nov 20 2026 - 03:00:38 EST
From: Jie Gu <jie.gu@xxxxxxxxxxxxxxxxxxxxxxx>
When the device switches from torch mode to flash or external strobe
mode, the hardware torch output is disabled, but the LED class
brightness cache may still keep the previous non-zero torch value.
This leaves sysfs brightness reporting an enabled torch state even
though the light is already off.
Update the cached LED brightness to LED_OFF when flash control takes
over so userspace state matches the actual hardware state.
Fixes: b338a2ae9b31 ("leds: tps6131x: Add support for Texas Instruments TPS6131X flash LED driver")
Reviewed-by: Matthias Fend <matthias.fend@xxxxxxxxx>
Tested-by: Matthias Fend <matthias.fend@xxxxxxxxx>
Signed-off-by: Jie Gu <jie.gu@xxxxxxxxxxxxxxxxxxxxxxx>
---
drivers/leds/flash/leds-tps6131x.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/flash/leds-tps6131x.c b/drivers/leds/flash/leds-tps6131x.c
index 823e0462939c..21957e4e3db4 100644
--- a/drivers/leds/flash/leds-tps6131x.c
+++ b/drivers/leds/flash/leds-tps6131x.c
@@ -398,6 +398,8 @@ static int tps6131x_strobe_set(struct led_classdev_flash *fled_cdev, bool state)
if (ret)
return ret;
+ fled_cdev->led_cdev.brightness = LED_OFF;
+
return 0;
}
@@ -697,12 +699,19 @@ static int tps6131x_flash_external_strobe_set(struct v4l2_flash *v4l2_flash, boo
{
struct led_classdev_flash *fled_cdev = v4l2_flash->fled_cdev;
struct tps6131x *tps6131x = fled_cdev_to_tps6131x(fled_cdev);
+ int ret;
cancel_delayed_work_sync(&tps6131x->torch_refresh_work);
guard(mutex)(&tps6131x->lock);
- return tps6131x_set_mode(tps6131x, enable ? TPS6131X_MODE_FLASH : TPS6131X_MODE_SHUTDOWN,
- false);
+ ret = tps6131x_set_mode(tps6131x, enable ? TPS6131X_MODE_FLASH : TPS6131X_MODE_SHUTDOWN,
+ false);
+ if (ret)
+ return ret;
+
+ fled_cdev->led_cdev.brightness = LED_OFF;
+
+ return 0;
}
static const struct v4l2_flash_ops tps6131x_v4l2_flash_ops = {
--
2.43.0