From: Dan Murphy Date: Wed, 11 Sep 2019 18:27:30 +0000 (-0500) Subject: leds: lm3532: Fix optional led-max-microamp prop error handling X-Git-Tag: v5.4-rc1~144^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d4faf3b6b6eb3c8a750b2e6659a5b1ff3dd9e75;p=platform%2Fkernel%2Flinux-rpi.git leds: lm3532: Fix optional led-max-microamp prop error handling 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 Signed-off-by: Dan Murphy Signed-off-by: Jacek Anaszewski --- diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c index 62ace66..0507c65 100644 --- a/drivers/leds/leds-lm3532.c +++ b/drivers/leds/leds-lm3532.c @@ -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;