From: Fenglin Wu Date: Tue, 25 Jul 2023 09:57:20 +0000 (+0800) Subject: leds: flash: leds-qcom-flash: Turn off LED before setting flash current X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7c47381c8664d55861036d1d858daf5e9d5d67b8;p=users%2Fjedix%2Flinux-maple.git leds: flash: leds-qcom-flash: Turn off LED before setting flash current Strobe off the LED before setting flash current to avoid it's being enabled with an incorrect current if it has been working in torch mode. Signed-off-by: Fenglin Wu Link: https://lore.kernel.org/r/20230725-leds-qcom-flash-driver-tiny-fixes-v2-2-0f5cbce5fed0@quicinc.com Signed-off-by: Lee Jones --- diff --git a/drivers/leds/flash/leds-qcom-flash.c b/drivers/leds/flash/leds-qcom-flash.c index b089ca1a1901..29cf09479422 100644 --- a/drivers/leds/flash/leds-qcom-flash.c +++ b/drivers/leds/flash/leds-qcom-flash.c @@ -309,6 +309,10 @@ static int qcom_flash_strobe_set(struct led_classdev_flash *fled_cdev, bool stat struct qcom_flash_led *led = flcdev_to_qcom_fled(fled_cdev); int rc; + rc = set_flash_strobe(led, SW_STROBE, false); + if (rc) + return rc; + rc = set_flash_current(led, led->flash_current_ma, FLASH_MODE); if (rc) return rc;