2013-08-31 06:45:56

by Libo Chen

Subject: [PATCH 3/3] driver: input: twl6040-vibra: fix missing of_node_put

decrease twl6040_core_node device_node refcount after task completion

There are two ways to implement the function of_node_put through
the marco CONFIG_OF_DYNAMIC, so it is save to call directly.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/input/misc/twl6040-vibra.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index 0c2dfc8..f16193a 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -271,12 +271,14 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
#endif

if (!pdata && !twl6040_core_node) {
+ of_node_put(twl6040_core_node);
dev_err(&pdev->dev, "platform_data not available\n");
return -EINVAL;
}

info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
if (!info) {
+ of_node_put(twl6040_core_node);
dev_err(&pdev->dev, "couldn't allocate memory\n");
return -ENOMEM;
}
@@ -304,6 +306,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
&vddvibl_uV);
of_property_read_u32(twl6040_core_node, "ti,vddvibr-uV",
&vddvibr_uV);
+ of_node_put(twl6040_core_node);
}

if ((!info->vibldrv_res && !info->viblmotor_res) ||
--
1.7.1

2013-09-01 17:00:06

by Peter Ujfalusi

Subject: Re: [PATCH 3/3] driver: input: twl6040-vibra: fix missing of_node_put

On 08/31/2013 09:45 AM, Libo Chen wrote:
>
> decrease twl6040_core_node device_node refcount after task completion
>
> There are two ways to implement the function of_node_put through
> the marco CONFIG_OF_DYNAMIC, so it is save to call directly.
>
> Signed-off-by: Libo Chen <[email protected]>

Acked-by: Peter Ujfalusi <[email protected]>

> ---
> drivers/input/misc/twl6040-vibra.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
> index 0c2dfc8..f16193a 100644
> --- a/drivers/input/misc/twl6040-vibra.c
> +++ b/drivers/input/misc/twl6040-vibra.c
> @@ -271,12 +271,14 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
> #endif
>
> if (!pdata && !twl6040_core_node) {
> + of_node_put(twl6040_core_node);
> dev_err(&pdev->dev, "platform_data not available\n");
> return -EINVAL;
> }
>
> info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
> if (!info) {
> + of_node_put(twl6040_core_node);
> dev_err(&pdev->dev, "couldn't allocate memory\n");
> return -ENOMEM;
> }
> @@ -304,6 +306,7 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
> &vddvibl_uV);
> of_property_read_u32(twl6040_core_node, "ti,vddvibr-uV",
> &vddvibr_uV);
> + of_node_put(twl6040_core_node);
> }
>
> if ((!info->vibldrv_res && !info->viblmotor_res) ||
>


--
P?ter