leds: lm3697: Make error handling more robust
authorAndy Shevchenko <andy.shevchenko@gmail.com>
Sat, 29 May 2021 11:19:32 +0000 (14:19 +0300)
committerPavel Machek <pavel@ucw.cz>
Tue, 3 Aug 2021 21:49:31 +0000 (23:49 +0200)
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>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
drivers/leds/leds-lm3697.c

index 292d64b..a8c9322 100644 (file)
@@ -226,14 +226,12 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                ret = fwnode_property_read_u32(child, "reg", &control_bank);
                if (ret) {
                        dev_err(dev, "reg property missing\n");
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
                if (control_bank > LM3697_CONTROL_B) {
                        dev_err(dev, "reg property is invalid\n");
                        ret = -EINVAL;
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
@@ -264,7 +262,6 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                                                    led->num_leds);
                if (ret) {
                        dev_err(dev, "led-sources property missing\n");
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
@@ -289,14 +286,16 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                                                     &init_data);
                if (ret) {
                        dev_err(dev, "led register err: %d\n", ret);
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
                i++;
        }
 
+       return ret;
+
 child_out:
+       fwnode_handle_put(child);
        return ret;
 }