Re: [PATCH 2/2] leds: tps6131x: clear torch brightness cache on flash takeover

From: Lee Jones

Date: Thu Nov 19 2026 - 04:11:01 EST


On Tue, 17 Nov 2026, jiegu wrote:

> From: gujie <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.
>
> Signed-off-by: gujie <jie.gu@xxxxxxxxxxxxxxxxxxxxxxx>

Real name please.

> ---
> drivers/leds/flash/leds-tps6131x.c | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/flash/leds-tps6131x.c b/drivers/leds/flash/leds-tps6131x.c
> index 823e0462939c..4f708cf56178 100644
> --- a/drivers/leds/flash/leds-tps6131x.c
> +++ b/drivers/leds/flash/leds-tps6131x.c
> @@ -294,6 +294,11 @@ static int tps6131x_set_mode(struct tps6131x *tps6131x, enum tps6131x_mode mode,
> NULL, false, force);
> }
>
> +static void tps6131x_sync_torch_brightness_off(struct tps6131x *tps6131x)
> +{
> + tps6131x->fled_cdev.led_cdev.brightness = LED_OFF;

Just put this at the call-site, then you can drop the `tps6131x->` part.

> +}
> +
> static void tps6131x_torch_refresh_handler(struct work_struct *work)
> {
> struct tps6131x *tps6131x = container_of(work, struct tps6131x, torch_refresh_work.work);
> @@ -398,6 +403,8 @@ static int tps6131x_strobe_set(struct led_classdev_flash *fled_cdev, bool state)
> if (ret)
> return ret;
>
> + tps6131x_sync_torch_brightness_off(tps6131x);
> +
> return 0;
> }
>
> @@ -697,12 +704,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;
> +
> + tps6131x_sync_torch_brightness_off(tps6131x);
> +
> + return 0;
> }
>
> static const struct v4l2_flash_ops tps6131x_v4l2_flash_ops = {
> --
> 2.43.0
>
>

--
Lee Jones