Fix the error handling for the led-max-microamp property.
Need to check if the property is present and then if it is
retrieve the setting and its max boundary

Reported-by: Pavel Machek <pa...@ucw.cz>
Signed-off-by: Dan Murphy <dmur...@ti.com>
---

v2 - Changed full scale current check to use min function

 drivers/leds/leds-lm3532.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index 62ace6698d25..a1742dc1f6fa 100644
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -601,11 +601,15 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                        goto child_out;
                }
 
-               ret = fwnode_property_read_u32(child, "led-max-microamp",
-                                              &led->full_scale_current);
-
-               if (led->full_scale_current > LM3532_FS_CURR_MAX)
-                       led->full_scale_current = LM3532_FS_CURR_MAX;
+               if (fwnode_property_present(child, "led-max-microamp")) {
+                       if (fwnode_property_read_u32(child, "led-max-microamp",
+                                                    &led->full_scale_current))
+                               dev_err(&priv->client->dev,
+                                       "Failed getting led-max-microamp\n");
+                       else
+                               min(led->full_scale_current,
+                                   LM3532_FS_CURR_MAX);
+               }
 
                if (led->mode == LM3532_BL_MODE_ALS) {
                        led->mode = LM3532_ALS_CTRL;
-- 
2.22.0.214.g8dca754b1e

Reply via email to