Skip to contentSkip to conversation

leds: lp50xx: add missing fwnode_handle_put in error handling case

PATCH Applied Qinglang Miao 3 participants 4 messages Nov 19, 2020 – Nov 25, 2020 LED

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 leds: lp50xx: add missing fwnode_handle_put in error handling case

Fix to set ret and goto child_out for fwnode_handle_put(child) in the error handling case rather than simply return, as done elsewhere in this function.

Fixes 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the RGB LED driver")

---
v2: forget to set ret on v1

 drivers/leds/leds-lp50xx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/leds/leds-lp50xx.c +4 -2
index 5fb4f24ae..f13117eed 100644
@@ -487,8 +487,10 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
 		 */
 		mc_led_info = devm_kcalloc(priv->dev, LP50XX_LEDS_PER_MODULE,
 					   sizeof(*mc_led_info), GFP_KERNEL);
-		if (!mc_led_info)
-			return -ENOMEM;
+		if (!mc_led_info) {
+			ret = -ENOMEM;
+			goto child_out;
+		}
 
 		fwnode_for_each_child_node(child, led_node) {
 			ret = fwnode_property_read_u32(led_node, "color",
Signature · 1 line
2.23.0
Reviewed-by on v2 1/1
#1 lore raw

Hello

Quoted 21 lines · Qinglang Miao

Fix to set ret and goto child_out for fwnode_handle_put(child) in the error handling case rather than simply return, as done elsewhere in this function.

Fixes 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the RGB LED driver")

---
v2: forget to set ret on v1

  drivers/leds/leds-lp50xx.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
drivers/leds/leds-lp50xx.c +0 -0
index 5fb4f24ae..f13117eed 100644
@@ -487,8 +487,10 @@ static int lp50xx_probe_dt(struct lp50xx *priv)
  		 */
  		mc_led_info = devm_kcalloc(priv->dev, LP50XX_LEDS_PER_MODULE,

drivers/leds/leds-lp50xx.c static int lp50xx_probe_dt(struct lp50xx *priv) · line 496

Quoted 10 lines
drivers/leds/leds-lp50xx.c +4 -2
  					   sizeof(*mc_led_info), GFP_KERNEL);
-		if (!mc_led_info)
-			return -ENOMEM;
+		if (!mc_led_info) {
+			ret = -ENOMEM;
+			goto child_out;
+		}
 
  		fwnode_for_each_child_node(child, led_node) {
  			ret = fwnode_property_read_u32(led_node, "color",
Applied
#2 lore raw
In reply to Qinglang Miao

Hi!

Quoted 8 lines

Fix to set ret and goto child_out for fwnode_handle_put(child) in the error handling case rather than simply return, as done elsewhere in this function.

Fixes 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the RGB LED driver")

Thanks, applied.

Best regards,
Pavel

Signature · 1 line
http://www.livejournal.com/~pavelmachek
#3 lore raw
In reply to Qinglang Miao
Quoted 8 lines · Qinglang Miao

Fix to set ret and goto child_out for fwnode_handle_put(child) in the error handling case rather than simply return, as done elsewhere in this function.

Fixes 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the RGB LED driver")

Sorry, spoke too fast. We already had equivalent patch in by

Fixes 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the

RGB LED driver")
Signed-off-by: Christophe JAILLET
<[email protected]>

Let me push that out in few minutes.. so you can double-check.

Sorry for confusion,

Pavel

Signature · 1 line
http://www.livejournal.com/~pavelmachek