[PATCH v2] leds: lp50xx: add missing fwnode_handle_put in error handling case

[PATCH v2] leds: lp50xx: add missing fwnode_handle_put in error handling case

[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")
Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
 v2: forget to set ret on v1

 drivers/leds/leds-lp50xx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
index 5fb4f24ae..f13117eed 100644
--- a/drivers/leds/leds-lp50xx.c
+++ b/drivers/leds/leds-lp50xx.c
@@ -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",
-- 
2.23.0

Re: [PATCH v2] leds: lp50xx: add missing fwnode_handle_put in error handling case

[Dan Murphy]

Hello

On 11/19/20 1:08 AM, Qinglang Miao wrote:
> 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")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
> ---
>   v2: forget to set ret on v1
>
>   drivers/leds/leds-lp50xx.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c
> index 5fb4f24ae..f13117eed 100644
> --- a/drivers/leds/leds-lp50xx.c
> +++ b/drivers/leds/leds-lp50xx.c
> @@ -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",
Reviewed-by: Dan Murphy <dmurphy@ti.com>

Re: [PATCH v2] leds: lp50xx: add missing fwnode_handle_put in error handling case

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi!

> 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")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>

Thanks, applied.

Best regards,
							Pavel
							
-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH v2] leds: lp50xx: add missing fwnode_handle_put in error handling case

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 844 bytes --]

On Thu 2020-11-19 15:08:41, Qinglang Miao wrote:
> 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")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Suggested-by: Pavel Machek <pavel@ucw.cz>
> Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>

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
    <christophe.jaillet@wanadoo.fr>

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

Sorry for confusion,

								Pavel

-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]