leds: tlc591xx: merge conditional tests

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

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
index 3045316..fcc87ee 100644 (file)
--- a/drivers/leds/leds-tlc591xx.c
+++ b/drivers/leds/leds-tlc591xx.c
@@ -232,9 +232,8 @@ tlc591xx_probe(struct i2c_client *client,
                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 =