]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
leds: lm3532: Fix optional led-max-microamp prop error handling
authorDan Murphy <dmurphy@ti.com>
Wed, 11 Sep 2019 18:27:30 +0000 (13:27 -0500)
committerJacek Anaszewski <jacek.anaszewski@gmail.com>
Thu, 12 Sep 2019 18:45:52 +0000 (20:45 +0200)
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 <pavel@ucw.cz>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
drivers/leds/leds-lm3532.c

index 62ace6698d25b1f063ea99eade1ef2d596558b47..0507c6575c0896853b47ba735c2fef332141b600 100644 (file)
@@ -601,11 +601,14 @@ 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") &&
+                   fwnode_property_read_u32(child, "led-max-microamp",
+                                            &led->full_scale_current))
+                       dev_err(&priv->client->dev,
+                               "Failed getting led-max-microamp\n");
+               else
+                       led->full_scale_current = min(led->full_scale_current,
+                                                     LM3532_FS_CURR_MAX);
 
                if (led->mode == LM3532_BL_MODE_ALS) {
                        led->mode = LM3532_ALS_CTRL;