diff options
| author | Marek Behún <kabel@kernel.org> | 2023-09-18 17:07:24 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-10 23:00:40 +0300 |
| commit | c14c7214fc68ec003c7ec7b36598da2d89d47421 (patch) | |
| tree | d08f2d634a8deede8badf4326a5db1099b854b87 | |
| parent | 6b706286473db4fd54b5f869faa67f4a8cb18e99 (diff) | |
| download | linux-c14c7214fc68ec003c7ec7b36598da2d89d47421.tar.xz | |
leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
[ Upstream commit 9dc1664fab2246bc2c3e9bf2cf21518a857f9b5b ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/leds/led-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index aad8bc44459f..d94d60b52646 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -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 |