apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

leds: gpio: fix and simplify error handling in gpio_leds_create

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

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
This commit is contained in:
Heiner Kallweit
2016-09-14 20:55:43 +02:00
committed by Jacek Anaszewski
parent bc2c0dd85a
commit 74b69e5246
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/leds/leds-gpio.c
+4 -8
View File
@@ -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); led.gpiod = devm_get_gpiod_from_child(dev, NULL, child);
if (IS_ERR(led.gpiod)) { if (IS_ERR(led.gpiod)) {
fwnode_handle_put(child); fwnode_handle_put(child);
ret = PTR_ERR(led.gpiod); return ERR_CAST(led.gpiod);
goto err;
} }
ret = fwnode_property_read_string(child, "label", &led.name); ret = fwnode_property_read_string(child, "label", &led.name);
if (ret && IS_ENABLED(CONFIG_OF) && np) if (ret && IS_ENABLED(CONFIG_OF) && np)
led.name = np->name; led.name = np->name;
if (!led.name) { if (!led.name) {
ret = -EINVAL; fwnode_handle_put(child);
goto err; return ERR_PTR(-EINVAL);
} }
fwnode_property_read_string(child, "linux,default-trigger", 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); ret = create_gpio_led(&led, led_dat, dev, NULL);
if (ret < 0) { if (ret < 0) {
fwnode_handle_put(child); fwnode_handle_put(child);
goto err; return ERR_PTR(ret);
} }
led_dat->cdev.dev->of_node = np; led_dat->cdev.dev->of_node = np;
priv->num_leds++; priv->num_leds++;
} }
return priv; return priv;
err:
return ERR_PTR(ret);
} }
static const struct of_device_id of_gpio_leds_match[] = { static const struct of_device_id of_gpio_leds_match[] = {