2015-11-10 03:00:38

by Ingi Kim

Subject: [PATCH] leds: ktd2692: Add missing of_node_put

The refcount of device_node increases after of_node_get() is called.
So, a break out of the loop requires of_node_put().

This patch adds missing of_node_put() when loop breaks.

Signed-off-by: Ingi Kim <[email protected]>
---
drivers/leds/leds-ktd2692.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
index feca07b..dbf37ce 100644
--- a/drivers/leds/leds-ktd2692.c
+++ b/drivers/leds/leds-ktd2692.c
@@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
&cfg->movie_max_microamp);
if (ret) {
dev_err(dev, "failed to parse led-max-microamp\n");
- return ret;
+ goto err_parse_dt;
}

ret = of_property_read_u32(child_node, "flash-max-microamp",
&cfg->flash_max_microamp);
if (ret) {
dev_err(dev, "failed to parse flash-max-microamp\n");
- return ret;
+ goto err_parse_dt;
}

ret = of_property_read_u32(child_node, "flash-max-timeout-us",
&cfg->flash_max_timeout);
- if (ret)
+ if (ret) {
dev_err(dev, "failed to parse flash-max-timeout-us\n");
+ goto err_parse_dt;
+ }
+
+ return 0;

+err_parse_dt:
of_node_put(child_node);
return ret;
}
--
2.0.5

2015-11-10 15:32:37

by Rob Herring

Subject: Re: [PATCH] leds: ktd2692: Add missing of_node_put

On Mon, Nov 9, 2015 at 9:00 PM, Ingi Kim <[email protected]> wrote:
> The refcount of device_node increases after of_node_get() is called.
> So, a break out of the loop requires of_node_put().
>
> This patch adds missing of_node_put() when loop breaks.
>
> Signed-off-by: Ingi Kim <[email protected]>

Acked-by: Rob Herring <[email protected]>

> ---
> drivers/leds/leds-ktd2692.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
> index feca07b..dbf37ce 100644
> --- a/drivers/leds/leds-ktd2692.c
> +++ b/drivers/leds/leds-ktd2692.c
> @@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
> &cfg->movie_max_microamp);
> if (ret) {
> dev_err(dev, "failed to parse led-max-microamp\n");
> - return ret;
> + goto err_parse_dt;
> }
>
> ret = of_property_read_u32(child_node, "flash-max-microamp",
> &cfg->flash_max_microamp);
> if (ret) {
> dev_err(dev, "failed to parse flash-max-microamp\n");
> - return ret;
> + goto err_parse_dt;
> }
>
> ret = of_property_read_u32(child_node, "flash-max-timeout-us",
> &cfg->flash_max_timeout);
> - if (ret)
> + if (ret) {
> dev_err(dev, "failed to parse flash-max-timeout-us\n");
> + goto err_parse_dt;
> + }
> +
> + return 0;
>
> +err_parse_dt:
> of_node_put(child_node);
> return ret;
> }
> --
> 2.0.5
>

2015-11-16 10:00:21

by Jacek Anaszewski

Subject: Re: [PATCH] leds: ktd2692: Add missing of_node_put

Hi Ingi, Rob,

With this patch we will be leaking of_node when parsing succeeds.
I think that "return 0" should be removed. I can remove it and apply,
provided that Rob's ack is still in force with this. Rob?

Best Regards,
Jacek Anaszewski

On 11/10/2015 04:00 AM, Ingi Kim wrote:
> The refcount of device_node increases after of_node_get() is called.
> So, a break out of the loop requires of_node_put().
>
> This patch adds missing of_node_put() when loop breaks.
>
> Signed-off-by: Ingi Kim <[email protected]>
> ---
> drivers/leds/leds-ktd2692.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
> index feca07b..dbf37ce 100644
> --- a/drivers/leds/leds-ktd2692.c
> +++ b/drivers/leds/leds-ktd2692.c
> @@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev,
> &cfg->movie_max_microamp);
> if (ret) {
> dev_err(dev, "failed to parse led-max-microamp\n");
> - return ret;
> + goto err_parse_dt;
> }
>
> ret = of_property_read_u32(child_node, "flash-max-microamp",
> &cfg->flash_max_microamp);
> if (ret) {
> dev_err(dev, "failed to parse flash-max-microamp\n");
> - return ret;
> + goto err_parse_dt;
> }
>
> ret = of_property_read_u32(child_node, "flash-max-timeout-us",
> &cfg->flash_max_timeout);
> - if (ret)
> + if (ret) {
> dev_err(dev, "failed to parse flash-max-timeout-us\n");
> + goto err_parse_dt;
> + }
> +
> + return 0;
>
> +err_parse_dt:
> of_node_put(child_node);
> return ret;
> }
>

2015-11-16 14:10:20

by Rob Herring

Subject: Re: [PATCH] leds: ktd2692: Add missing of_node_put

On Mon, Nov 16, 2015 at 4:00 AM, Jacek Anaszewski
<[email protected]> wrote:
> Hi Ingi, Rob,
>
> With this patch we will be leaking of_node when parsing succeeds.
> I think that "return 0" should be removed. I can remove it and apply,
> provided that Rob's ack is still in force with this. Rob?

Okay.

Rob

>
> Best Regards,
> Jacek Anaszewski
>
>
> On 11/10/2015 04:00 AM, Ingi Kim wrote:
>>
>> The refcount of device_node increases after of_node_get() is called.
>> So, a break out of the loop requires of_node_put().
>>
>> This patch adds missing of_node_put() when loop breaks.
>>
>> Signed-off-by: Ingi Kim <[email protected]>
>> ---
>> drivers/leds/leds-ktd2692.c | 11 ++++++++---
>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
>> index feca07b..dbf37ce 100644
>> --- a/drivers/leds/leds-ktd2692.c
>> +++ b/drivers/leds/leds-ktd2692.c
>> @@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context
>> *led, struct device *dev,
>> &cfg->movie_max_microamp);
>> if (ret) {
>> dev_err(dev, "failed to parse led-max-microamp\n");
>> - return ret;
>> + goto err_parse_dt;
>> }
>>
>> ret = of_property_read_u32(child_node, "flash-max-microamp",
>> &cfg->flash_max_microamp);
>> if (ret) {
>> dev_err(dev, "failed to parse flash-max-microamp\n");
>> - return ret;
>> + goto err_parse_dt;
>> }
>>
>> ret = of_property_read_u32(child_node, "flash-max-timeout-us",
>> &cfg->flash_max_timeout);
>> - if (ret)
>> + if (ret) {
>> dev_err(dev, "failed to parse flash-max-timeout-us\n");
>> + goto err_parse_dt;
>> + }
>> +
>> + return 0;
>>
>> +err_parse_dt:
>> of_node_put(child_node);
>> return ret;
>> }
>>
>

2015-11-16 14:30:24

by Jacek Anaszewski

Subject: Re: [PATCH] leds: ktd2692: Add missing of_node_put

On 11/16/2015 03:09 PM, Rob Herring wrote:
> On Mon, Nov 16, 2015 at 4:00 AM, Jacek Anaszewski
> <[email protected]> wrote:
>> Hi Ingi, Rob,
>>
>> With this patch we will be leaking of_node when parsing succeeds.
>> I think that "return 0" should be removed. I can remove it and apply,
>> provided that Rob's ack is still in force with this. Rob?
>
> Okay.

Removed discussed line and applied, thanks.

>> On 11/10/2015 04:00 AM, Ingi Kim wrote:
>>>
>>> The refcount of device_node increases after of_node_get() is called.
>>> So, a break out of the loop requires of_node_put().
>>>
>>> This patch adds missing of_node_put() when loop breaks.
>>>
>>> Signed-off-by: Ingi Kim <[email protected]>
>>> ---
>>> drivers/leds/leds-ktd2692.c | 11 ++++++++---
>>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
>>> index feca07b..dbf37ce 100644
>>> --- a/drivers/leds/leds-ktd2692.c
>>> +++ b/drivers/leds/leds-ktd2692.c
>>> @@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context
>>> *led, struct device *dev,
>>> &cfg->movie_max_microamp);
>>> if (ret) {
>>> dev_err(dev, "failed to parse led-max-microamp\n");
>>> - return ret;
>>> + goto err_parse_dt;
>>> }
>>>
>>> ret = of_property_read_u32(child_node, "flash-max-microamp",
>>> &cfg->flash_max_microamp);
>>> if (ret) {
>>> dev_err(dev, "failed to parse flash-max-microamp\n");
>>> - return ret;
>>> + goto err_parse_dt;
>>> }
>>>
>>> ret = of_property_read_u32(child_node, "flash-max-timeout-us",
>>> &cfg->flash_max_timeout);
>>> - if (ret)
>>> + if (ret) {
>>> dev_err(dev, "failed to parse flash-max-timeout-us\n");
>>> + goto err_parse_dt;
>>> + }
>>> +
>>> + return 0;
>>>
>>> +err_parse_dt:
>>> of_node_put(child_node);
>>> return ret;
>>> }
>>>
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>


--
Best Regards,
Jacek Anaszewski

2015-11-17 00:06:00

by Ingi Kim

Subject: Re: [PATCH] leds: ktd2692: Add missing of_node_put

Hi Rob, Jacek

You're right,
It is better to remove "return 0"

Thanks for the review.

On 2015년 11월 16일 23:30, Jacek Anaszewski wrote:
> On 11/16/2015 03:09 PM, Rob Herring wrote:
>> On Mon, Nov 16, 2015 at 4:00 AM, Jacek Anaszewski
>> <[email protected]> wrote:
>>> Hi Ingi, Rob,
>>>
>>> With this patch we will be leaking of_node when parsing succeeds.
>>> I think that "return 0" should be removed. I can remove it and apply,
>>> provided that Rob's ack is still in force with this. Rob?
>>
>> Okay.
>
> Removed discussed line and applied, thanks.
>
>>> On 11/10/2015 04:00 AM, Ingi Kim wrote:
>>>>
>>>> The refcount of device_node increases after of_node_get() is called.
>>>> So, a break out of the loop requires of_node_put().
>>>>
>>>> This patch adds missing of_node_put() when loop breaks.
>>>>
>>>> Signed-off-by: Ingi Kim <[email protected]>
>>>> ---
>>>> drivers/leds/leds-ktd2692.c | 11 ++++++++---
>>>> 1 file changed, 8 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c
>>>> index feca07b..dbf37ce 100644
>>>> --- a/drivers/leds/leds-ktd2692.c
>>>> +++ b/drivers/leds/leds-ktd2692.c
>>>> @@ -332,21 +332,26 @@ static int ktd2692_parse_dt(struct ktd2692_context
>>>> *led, struct device *dev,
>>>> &cfg->movie_max_microamp);
>>>> if (ret) {
>>>> dev_err(dev, "failed to parse led-max-microamp\n");
>>>> - return ret;
>>>> + goto err_parse_dt;
>>>> }
>>>>
>>>> ret = of_property_read_u32(child_node, "flash-max-microamp",
>>>> &cfg->flash_max_microamp);
>>>> if (ret) {
>>>> dev_err(dev, "failed to parse flash-max-microamp\n");
>>>> - return ret;
>>>> + goto err_parse_dt;
>>>> }
>>>>
>>>> ret = of_property_read_u32(child_node, "flash-max-timeout-us",
>>>> &cfg->flash_max_timeout);
>>>> - if (ret)
>>>> + if (ret) {
>>>> dev_err(dev, "failed to parse flash-max-timeout-us\n");
>>>> + goto err_parse_dt;
>>>> + }
>>>> +
>>>> + return 0;
>>>>
>>>> +err_parse_dt:
>>>> of_node_put(child_node);
>>>> return ret;
>>>> }
>>>>
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>>
>
>