Skip to content

Commit

Permalink
leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
Browse files Browse the repository at this point in the history
[ Upstream commit 9dc1664 ]

Commit c3f8531 ("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: c3f8531 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
elkablo authored and gregkh committed Oct 10, 2023
1 parent 6b70628 commit c14c721
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/leds/led-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,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
Expand Down

0 comments on commit c14c721

Please sign in to comment.