| Message ID | 20210510095045.3299382-5-andy.shevchenko@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | leds: cleanups and fwnode refcounting bug fixes | expand |
10.05.21 12:50, Andy Shevchenko пише: > It's easy to miss necessary clean up, e.g. firmware node reference counting, > during error path in ->probe(). Make it more robust by moving to a single > point of return. > > Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> > --- > drivers/leds/leds-el15203000.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c > index 912451db05e6..bcdbbbc9c187 100644 > --- a/drivers/leds/leds-el15203000.c > +++ b/drivers/leds/leds-el15203000.c > @@ -246,16 +246,13 @@ static int el15203000_probe_dt(struct el15203000 *priv) > ret = fwnode_property_read_u32(child, "reg", &led->reg); > if (ret) { > dev_err(priv->dev, "LED without ID number"); > - fwnode_handle_put(child); > - > - break; > + goto err_child_out; > } > > if (led->reg > U8_MAX) { > dev_err(priv->dev, "LED value %d is invalid", led->reg); > - fwnode_handle_put(child); > - > - return -EINVAL; > + ret = -EINVAL; > + goto err_child_out; > } > > led->priv = priv; > @@ -277,14 +274,16 @@ static int el15203000_probe_dt(struct el15203000 *priv) > dev_err(priv->dev, > "failed to register LED device %s, err %d", > led->ldev.name, ret); > - fwnode_handle_put(child); > - > - break; > + goto err_child_out; > } > > led++; > } > > + return 0; > + > +err_child_out: > + fwnode_handle_put(child); > return ret; > } > > Reviewed-by: Oleh Kravchenko <oleg@kaa.org.ua>
diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c index 912451db05e6..bcdbbbc9c187 100644 --- a/drivers/leds/leds-el15203000.c +++ b/drivers/leds/leds-el15203000.c @@ -246,16 +246,13 @@ static int el15203000_probe_dt(struct el15203000 *priv) ret = fwnode_property_read_u32(child, "reg", &led->reg); if (ret) { dev_err(priv->dev, "LED without ID number"); - fwnode_handle_put(child); - - break; + goto err_child_out; } if (led->reg > U8_MAX) { dev_err(priv->dev, "LED value %d is invalid", led->reg); - fwnode_handle_put(child); - - return -EINVAL; + ret = -EINVAL; + goto err_child_out; } led->priv = priv; @@ -277,14 +274,16 @@ static int el15203000_probe_dt(struct el15203000 *priv) dev_err(priv->dev, "failed to register LED device %s, err %d", led->ldev.name, ret); - fwnode_handle_put(child); - - break; + goto err_child_out; } led++; } + return 0; + +err_child_out: + fwnode_handle_put(child); return ret; }
It's easy to miss necessary clean up, e.g. firmware node reference counting, during error path in ->probe(). Make it more robust by moving to a single point of return. Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> --- drivers/leds/leds-el15203000.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)