Skip to contentSkip to conversation

leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

PATCH Applied Marek Behún 3 participants 6 messages Sep 18, 2023 – Sep 19, 2023 LED

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/leds/led-core.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/leds/led-core.c +0 -4
index 04f9ea675f2c..214ed81eb0e9 100644
@@ -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
Signature · 1 line
2.41.0
#2 lore raw

Hi!

Quoted 7 lines

Greg tells me to pester LED maintainers to get this into Linus' tree soon, so that we can avoid stable incosistencies (see
https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).

Sorry about the inconvenience, this would not happen if this was not sent into stable in the first place, which is my fault, since I added the Fixes tag.

Actually, no, it is not your fault. It was pretty clear your patch is not "fixing serious bug" so it should not have gone into stable in the first place.

For mainline, should we perhaps keep the BUG_ON and fix the affected driver, instead?

Best regards,
Pavel

Signature · 1 line
People of Russia, stop Putin before his war on Ukraine escalates.
#3 lore raw

Hi!

Quoted 8 lines
Quoted 7 lines

Greg tells me to pester LED maintainers to get this into Linus' tree soon, so that we can avoid stable incosistencies (see
https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).

Sorry about the inconvenience, this would not happen if this was not sent into stable in the first place, which is my fault, since I added the Fixes tag.

Quoted 6 lines

Actually, no, it is not your fault. It was pretty clear your patch is not "fixing serious bug" so it should not have gone into stable in the first place.

For mainline, should we perhaps keep the BUG_ON and fix the affected driver, instead?

Aha, rereading the discussion.. yes, we want to drop the BUG_ON. Sorry for the noise.

Best regards,
Pavel

Signature · 1 line
People of Russia, stop Putin before his war on Ukraine escalates.
maintainer
#4 lore raw
In reply to Marek Behún
Quoted 9 lines · Marek Behún

Hello,

Greg tells me to pester LED maintainers to get this into Linus' tree soon, so that we can avoid stable incosistencies (see
https://lore.kernel.org/stable/2023091901-vessel-giggling-55ee@gregkh/).

Sorry about the inconvenience, this would not happen if this was not sent into stable in the first place, which is my fault, since I added the Fixes tag.

Starting back on upstream work now.

I'll get something out shortly.

Signature · 1 line
Lee Jones [李琼斯]
maintainer Applied
#5 lore raw

Re: (subset) [PATCH] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

In reply to Marek Behún
Quoted 8 lines · Marek Behún

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.

[...]

Applied, thanks!

[1/1] leds: Drop BUG_ON check for LED_COLOR_ID_MULTI

      commit: 9dc1664fab2246bc2c3e9bf2cf21518a857f9b5b

--
Lee Jones [李琼斯]