diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-05 11:07:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-05 11:07:03 -0700 |
| commit | e90822d7ce017ee11aedf424c8abf38b07c802f0 (patch) | |
| tree | dad770b7a2aad4f5acf604cb1bdc7a6d9ef0040e | |
| parent | bc622f16c18dd5ef72a8b598b1d9e77bbe0c11d3 (diff) | |
| parent | 9dc1664fab2246bc2c3e9bf2cf21518a857f9b5b (diff) | |
Merge tag 'leds-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds
Pull LED fix from Lee Jones:
"Just the one bug-fix:
- Fix regression affecting LED_COLOR_ID_MULTI users"
* tag 'leds-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds:
leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
| -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 04f9ea675f2c..214ed81eb0e9 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -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 |