Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b69e52 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jacek Anaszewski
Browse files

leds: gpio: fix and simplify error handling in gpio_leds_create 



Simplify the error handling and add a missing call to fwnode_handle_put
when checking led.name.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent bc2c0dd8

drivers/leds/leds-gpio.c

+4 −8
Original line number Diff line number Diff line
@@ -177,16 +177,15 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
		led.gpiod = devm_get_gpiod_from_child(dev, NULL, child);

		if (IS_ERR(led.gpiod)) {

			fwnode_handle_put(child);

			ret = PTR_ERR(led.gpiod);

			goto err;

			return ERR_CAST(led.gpiod);

		}



		ret = fwnode_property_read_string(child, "label", &led.name);

		if (ret && IS_ENABLED(CONFIG_OF) && np)

			led.name = np->name;

		if (!led.name) {

			ret = -EINVAL;

			goto err;

			fwnode_handle_put(child);

			return ERR_PTR(-EINVAL);

		}



		fwnode_property_read_string(child, "linux,default-trigger",
@@ -210,16 +209,13 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
		ret = create_gpio_led(&led, led_dat, dev, NULL);

		if (ret < 0) {

			fwnode_handle_put(child);

			goto err;

			return ERR_PTR(ret);

		}

		led_dat->cdev.dev->of_node = np;

		priv->num_leds++;

	}



	return priv;



err:

	return ERR_PTR(ret);

}



static const struct of_device_id of_gpio_leds_match[] = {