diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-12-12 09:22:44 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-12-25 19:59:51 -0500 |
commit | c62b2b3448330ce1056d7730a01db4e19c95cfca (patch) | |
tree | a36026e781b50756a48ecfcf705507665012defa /drivers/pinctrl/pinctrl-at91.c | |
parent | b9cfddd90d03b9000f1dd969149c0d091101dcef (diff) |
drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree
The function at91_dt_node_to_map is ultimately called by the function
pinctrl_get, which is an exported function. Since it is possible that this
function is not called from within a probe function, for safety, the kfree
is converted to a devm_kfree, to both free the data and remove it from the
device in a failure situation.
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index c5e757157183..bff54bfaff43 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c | |||
@@ -265,7 +265,7 @@ static int at91_dt_node_to_map(struct pinctrl_dev *pctldev, | |||
265 | /* create mux map */ | 265 | /* create mux map */ |
266 | parent = of_get_parent(np); | 266 | parent = of_get_parent(np); |
267 | if (!parent) { | 267 | if (!parent) { |
268 | kfree(new_map); | 268 | devm_kfree(pctldev->dev, new_map); |
269 | return -EINVAL; | 269 | return -EINVAL; |
270 | } | 270 | } |
271 | new_map[0].type = PIN_MAP_TYPE_MUX_GROUP; | 271 | new_map[0].type = PIN_MAP_TYPE_MUX_GROUP; |