diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:16:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-24 13:16:37 +1000 |
| commit | 49613a87d12b519d9f8239ebb71e0fb571cc0583 (patch) | |
| tree | 494b81651a613ef20dfa1883703333bbd5b0ab35 /drivers | |
| parent | e2779ba33719a2d119be50afe40cc4e854a2a5f9 (diff) | |
| parent | c68729119f4d2993bec3c9cb999ad76de5aeddba (diff) | |
Merge remote-tracking branch 'leds/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/leds/leds-tlc591xx.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c index 304531644938..f5357f6d9e58 100644 --- a/drivers/leds/leds-tlc591xx.c +++ b/drivers/leds/leds-tlc591xx.c @@ -230,12 +230,15 @@ tlc591xx_probe(struct i2c_client *client, for_each_child_of_node(np, child) { err = of_property_read_u32(child, "reg", ®); - if (err) + if (err) { + of_node_put(child); return err; - if (reg < 0 || reg >= tlc591xx->max_leds) - return -EINVAL; - if (priv->leds[reg].active) + } + if (reg < 0 || reg >= tlc591xx->max_leds || + priv->leds[reg].active) { + of_node_put(child); return -EINVAL; + } priv->leds[reg].active = true; priv->leds[reg].ldev.name = of_get_property(child, "label", NULL) ? : child->name; |