2012-06-07 16:49:35

by devendra.aaru

Subject: [PATCH V2 2/2] pinctrl: pinctrl-imx: free if of_get_parent fails to get the parent node

of_get_parent can return null if no parent node found, so the allocated new_map
should be freed.

Signed-off-by: Devendra Naga <[email protected]>
Acked-by: Dong Aisheng <[email protected]>
---
drivers/pinctrl/pinctrl-imx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index 7a59a59..59a5fa3 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -173,8 +173,10 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,

/* create mux map */
parent = of_get_parent(np);
- if (!parent)
+ if (!parent) {
+ kfree(new_map);
return -EINVAL;
+ }
new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
new_map[0].data.mux.function = parent->name;
new_map[0].data.mux.group = np->name;
--
1.7.9.5

2012-06-12 11:03:04

by Linus Walleij

Subject: Re: [PATCH V2 2/2] pinctrl: pinctrl-imx: free if of_get_parent fails to get the parent node

On Thu, Jun 7, 2012 at 6:49 PM, Devendra Naga <[email protected]> wrote:

> of_get_parent can return null if no parent node found, so the allocated new_map
> should be freed.
>
> Signed-off-by: Devendra Naga <[email protected]>
> Acked-by: Dong Aisheng <[email protected]>

Applied this v2 version, thanks!
Linus Walleij