diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-30 12:39:41 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-30 12:39:41 +0200 |
| commit | 671546ba6491ab10e2c0d3dfa2adbaab205cee0d (patch) | |
| tree | a4aab919641c1f2b161c10355a33926fe55ff15d /drivers/power/supply/power_supply_leds.c | |
| parent | c4eba2cbafff7d770dd4e40ba9168bd4f0f2047f (diff) | |
| parent | 0ab06468cbd149aac0d7f216ec00452ff8c74e0b (diff) | |
Merge tag 'v5.15.114' into 5.15-2.2.x-imx
This is the 5.15.114 stable release
Conflicts:
drivers/regulator/pca9450-regulator.c
drivers/usb/dwc3/core.h
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'drivers/power/supply/power_supply_leds.c')
| -rw-r--r-- | drivers/power/supply/power_supply_leds.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/supply/power_supply_leds.c b/drivers/power/supply/power_supply_leds.c index d69880cc3593..b7a2778f878d 100644 --- a/drivers/power/supply/power_supply_leds.c +++ b/drivers/power/supply/power_supply_leds.c @@ -34,8 +34,9 @@ static void power_supply_update_bat_leds(struct power_supply *psy) led_trigger_event(psy->charging_full_trig, LED_FULL); led_trigger_event(psy->charging_trig, LED_OFF); led_trigger_event(psy->full_trig, LED_FULL); - led_trigger_event(psy->charging_blink_full_solid_trig, - LED_FULL); + /* Going from blink to LED on requires a LED_OFF event to stop blink */ + led_trigger_event(psy->charging_blink_full_solid_trig, LED_OFF); + led_trigger_event(psy->charging_blink_full_solid_trig, LED_FULL); break; case POWER_SUPPLY_STATUS_CHARGING: led_trigger_event(psy->charging_full_trig, LED_FULL); |