Merge conditionals that have the same then branch, to prepare for extending
that branch with of_node_put.

Signed-off-by: Julia Lawall <[email protected]>

---
 drivers/leds/leds-tlc591xx.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index 30453164..fcc87ee 100644
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -232,9 +232,8 @@ struct tlc591xx {
                err = of_property_read_u32(child, "reg", &reg);
                if (err)
                        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)
                        return -EINVAL;
                priv->leds[reg].active = true;
                priv->leds[reg].ldev.name =

Reply via email to