]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
authorMarek BehĂșn <kabel@kernel.org>
Mon, 18 Sep 2023 14:07:24 +0000 (16:07 +0200)
committerLee Jones <lee@kernel.org>
Tue, 19 Sep 2023 14:16:23 +0000 (15:16 +0100)
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@duo.ucw.cz/T/
Signed-off-by: Marek BehĂșn <kabel@kernel.org>
Link: https://lore.kernel.org/r/20230918140724.18634-1-kabel@kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/leds/led-core.c

index 04f9ea675f2cef6a7653aef2573fd56083640736..214ed81eb0e926cf8be1502395186c7d2bf6f0c1 100644 (file)
@@ -479,10 +479,6 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data,
 
        led_parse_fwnode_props(dev, fwnode, &props);
 
-       /* We want to label LEDs that can produce full range of colors
-        * as RGB, not multicolor */
-       BUG_ON(props.color == LED_COLOR_ID_MULTI);
-
        if (props.label) {
                /*
                 * If init_data.devicename is NULL, then it indicates that