summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorOndrej Jirman <megi@xff.cz>2024-02-17 22:11:30 +0300
committerLee Jones <lee@kernel.org>2024-03-07 11:48:12 +0300
commit205c29887a333ee4b37596e6533373e38cb23947 (patch)
treed0d3a3121adc89099bce77bc98a1227e57de8e0a /drivers/leds
parent2cd0d1db31e78a63553876f8e6a4c9dcc1f9c061 (diff)
downloadlinux-205c29887a333ee4b37596e6533373e38cb23947.tar.xz
leds: sgm3140: Add missing timer cleanup and flash gpio control
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>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/flash/leds-sgm3140.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/leds/flash/leds-sgm3140.c b/drivers/leds/flash/leds-sgm3140.c
index eb648ff54b4e..db0ac6641954 100644
--- a/drivers/leds/flash/leds-sgm3140.c
+++ b/drivers/leds/flash/leds-sgm3140.c
@@ -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) {