4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me 
know.

---8<------------------------------------------------------------

From: Stefan Wahren <stefan.wah...@i2se.com>

commit 53653c6b91750debba6dc4503003c851257fd340 upstream.

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.wah...@i2se.com>
Fixes: e1b2dc70cd5b ("pinctrl: add bcm2835 driver")
Reviewed-by: Eric Anholt <e...@anholt.net>
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
Signed-off-by: Kamal Mostafa <ka...@canonical.com>
---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c 
b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
index 7a2d53c..8f93ec3 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -805,7 +805,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;
 }
 
-- 
1.9.1

Reply via email to