Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "leds: spi-byte: Call of_node_put() on error path"

Browse source 
This reverts commit 138edb23f7.
This commit is contained in:
Ksawlii 2024-11-24 00:23:43 +01:00
parent 9c8504d56e
commit 3c26f43512
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/leds/leds-spi-byte.c
View file

@ -91,6 +91,7 @@ static int spi_byte_probe(struct spi_device *spi)
dev_err(dev, "Device must have exactly one LED sub-node."); dev_err(dev, "Device must have exactly one LED sub-node.");
return -EINVAL; return -EINVAL;
} }
child = of_get_next_available_child(dev_of_node(dev), NULL);
led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
if (!led) if (!led)
@ -106,13 +107,11 @@ static int spi_byte_probe(struct spi_device *spi)
led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value; led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value;
led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking; led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking;
child = of_get_next_available_child(dev_of_node(dev), NULL);
state = of_get_property(child, "default-state", NULL); state = of_get_property(child, "default-state", NULL);
if (state) { if (state) {
if (!strcmp(state, "on")) { if (!strcmp(state, "on")) {
led->ldev.brightness = led->ldev.max_brightness; led->ldev.brightness = led->ldev.max_brightness;
} else if (strcmp(state, "off")) { } else if (strcmp(state, "off")) {
of_node_put(child);
/* all other cases except "off" */ /* all other cases except "off" */
dev_err(dev, "default-state can only be 'on' or 'off'"); dev_err(dev, "default-state can only be 'on' or 'off'");
return -EINVAL; return -EINVAL;
@ -123,12 +122,9 @@ static int spi_byte_probe(struct spi_device *spi)
ret = devm_led_classdev_register(&spi->dev, &led->ldev); ret = devm_led_classdev_register(&spi->dev, &led->ldev);
if (ret) { if (ret) {
of_node_put(child);
mutex_destroy(&led->mutex); mutex_destroy(&led->mutex);
return ret; return ret;
} }
of_node_put(child);
spi_set_drvdata(spi, led); spi_set_drvdata(spi, led);
return 0; return 0;