From: Marek Behún Date: Tue, 1 Aug 2023 15:16:23 +0000 (+0200) Subject: leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false X-Git-Tag: v6.6.17~3998^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3f853184bed04105682383c2971798c572226b5;p=platform%2Fkernel%2Flinux-rpi.git leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false At the time we call BUG_ON(props.color == LED_COLOR_ID_MULTI); the props variable is still initialized to zero. Call the BUG_ON only after we parse fwnode into props. Fixes: 77dce3a22e89 ("leds: disallow /sys/class/leds/*:multi:* for now") Signed-off-by: Marek Behún Link: https://lore.kernel.org/r/20230801151623.30387-1-kabel@kernel.org Signed-off-by: Lee Jones --- diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index b9b1295..04f9ea6 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -474,15 +474,15 @@ int led_compose_name(struct device *dev, struct led_init_data *init_data, struct fwnode_handle *fwnode = init_data->fwnode; const char *devicename = init_data->devicename; - /* 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 (!led_classdev_name) return -EINVAL; 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