Commit e90822d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bc622f16 9dc1664f

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