Commit 9dc1664f authored by Marek Behún's avatar Marek Behún Committed by Lee Jones
Browse files

leds: Drop BUG_ON check for LED_COLOR_ID_MULTI 



Commit c3f85318 ("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: c3f85318 ("leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false")
Reported-by: default avatarDa Xue <da@libre.computer>
Closes: https://lore.kernel.org/linux-leds/ZQLelWcNjjp2xndY@duo.ucw.cz/T/


Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20230918140724.18634-1-kabel@kernel.org


Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 0bb80ecc

drivers/leds/led-core.c

+0 −4
Original line number Diff line number Diff line
@@ -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