On Fri, 06 Oct 2023, Mark Rutland wrote:
> On Fri, Oct 06, 2023 at 03:24:04PM +0100, Mark Rutland wrote:
> > On Tue, Aug 01, 2023 at 05:16:23PM +0200, Marek Beh'un wrote:
> > > At the time we call
> > > BUG_ON(props.color == LED_COLOR_ID_MULTI);
> > > the props variable is still initialized to zero.
> > >
> > > Call the BUG_ON only after we parse fwnode into props.
> > >
> > > Fixes: 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now")
> > > Signed-off-by: Marek Beh'un <kabel@xxxxxxxxxx>
> >
> > I've just discovered this has broken boot on my Libre Computer
> > AML-A311D-CC-V0.2, which was working just fine with Debian 12's stock kernel:
>
> Sorry the the noise; I've just spotted this is fixed by:
>
> https://lore.kernel.org/linux-leds/20230918140724.18634-1-kabel@xxxxxxxxxx/
>
> ... and I look forward to that hitting mainline :)
Your long agonising wait is over:
commit 9dc1664fab2246bc2c3e9bf2cf21518a857f9b5b
Author: Marek Behún <kabel@xxxxxxxxxx>
Date: Mon Sep 18 16:07:24 2023 +0200
leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
Commit c3f853184bed ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that
is always false") fixed a no-op BUG_ON. This turned out to cause a
regression, since some in-tree device-tree files already use
LED_COLOR_ID_MULTI.
Drop the BUG_ON altogether.
Fixes: c3f853184bed ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false")
Reported-by: Da Xue <da@libre.computer>
Closes: https://lore.kernel.org/linux-leds/ZQLelWcNjjp2xndY@xxxxxxxxxx/T/
Signed-off-by: Marek Behún <kabel@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230918140724.18634-1-kabel@xxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
drivers/leds/led-core.c | 4 ----
1 file changed, 4 deletions(-)
--
Lee Jones [李琼斯]
