leds: sgm3140: Add missing timer cleanup and flash gpio control
authorOndrej Jirman <megi@xff.cz>
Sat, 17 Feb 2024 19:11:30 +0000 (20:11 +0100)
committerLee Jones <lee@kernel.org>
Thu, 7 Mar 2024 08:48:12 +0000 (08:48 +0000)
Enabling strobe and then setting brightness to 0 causes the driver to enter
invalid state after strobe end timer fires. We should cancel strobe mode
resources when changing brightness (aka torch mode).

Fixes: cef8ec8cbd21 ("leds: add sgm3140 driver")
Signed-off-by: Ondrej Jirman <megi@xff.cz>
Link: https://lore.kernel.org/r/20240217191133.1757553-1-megi@xff.cz
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/leds/flash/leds-sgm3140.c

index eb648ff54b4e5507a7090e236a34cb515b96f82d..db0ac6641954e940afbc7a84b81dc87c254899dc 100644 (file)
@@ -114,8 +114,11 @@ static int sgm3140_brightness_set(struct led_classdev *led_cdev,
                                "failed to enable regulator: %d\n", ret);
                        return ret;
                }
+               gpiod_set_value_cansleep(priv->flash_gpio, 0);
                gpiod_set_value_cansleep(priv->enable_gpio, 1);
        } else {
+               del_timer_sync(&priv->powerdown_timer);
+               gpiod_set_value_cansleep(priv->flash_gpio, 0);
                gpiod_set_value_cansleep(priv->enable_gpio, 0);
                ret = regulator_disable(priv->vin_regulator);
                if (ret) {