summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/bcm
diff options
context:
space:
mode:
authorStefan Wahren <stefan.wahren@i2se.com>2015-12-21 00:44:04 +0000
committerLinus Walleij <linus.walleij@linaro.org>2015-12-22 13:50:37 +0100
commit53653c6b91750debba6dc4503003c851257fd340 (patch)
tree44efdc22762373e4cc6c05cb618e7013bbc470e4 /drivers/pinctrl/bcm
parent4fc8a4b2a4dd7704d950a01b1afec5e86af60565 (diff)
downloadlinux-53653c6b91750debba6dc4503003c851257fd340.tar.bz2
pinctrl: bcm2835: Fix memory leak in error path
In case of an invalid pin value bcm2835_pctl_dt_node_to_map() would leak the pull configs of already assigned pins. So avoid this by calling the free map function in error case. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Fixes: e1b2dc70cd5b ("pinctrl: add bcm2835 driver") Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/bcm')
-rw-r--r--drivers/pinctrl/bcm/pinctrl-bcm2835.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index a1ea565fcd46..f26d37481632 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -794,7 +794,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
return 0;
out:
- kfree(maps);
+ bcm2835_pctl_dt_free_map(pctldev, maps, num_pins * maps_per_pin);
return err;
}