Skip to content

Commit

Permalink
leds: Fix BUG_ON check for LED_COLOR_ID_MULTI that is always false
Browse files Browse the repository at this point in the history
[ Upstream commit c3f8531 ]

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: 77dce3a ("leds: disallow /sys/class/leds/*:multi:* for now")
Signed-off-by: Marek Behún <kabel@kernel.org>
Link: https://lore.kernel.org/r/20230801151623.30387-1-kabel@kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
elkablo authored and gregkh committed Sep 13, 2023
1 parent a253c41 commit f741121
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/leds/led-core.c
Expand Up @@ -419,15 +419,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
Expand Down

0 comments on commit f741121

Please sign in to comment.