aboutsummaryrefslogtreecommitdiff
path: root/drivers/pinctrl/nxp/pinctrl-imx.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-18 17:17:45 -0400
committerTom Rini <trini@konsulko.com>2017-05-18 17:17:45 -0400
commita375ff8e14bea0a5cbfff99d6456aa8d9a3320ab (patch)
tree566c9bc63d01ce843b1ea8f5e6aea8792b7e8384 /drivers/pinctrl/nxp/pinctrl-imx.c
parent753a4dde970c2bc9022321f1093e544e3a150f6e (diff)
parent5c84ad097d829bb1e6460438f33e1536b23b3c9b (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/pinctrl/nxp/pinctrl-imx.c')
-rw-r--r--drivers/pinctrl/nxp/pinctrl-imx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c
index f0321c4057..ebc14a31f1 100644
--- a/drivers/pinctrl/nxp/pinctrl-imx.c
+++ b/drivers/pinctrl/nxp/pinctrl-imx.c
@@ -53,6 +53,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
if (fdtdec_get_int_array(gd->fdt_blob, node, "fsl,pins",
pin_data, size >> 2)) {
dev_err(dev, "Error reading pin data.\n");
+ devm_kfree(dev, pin_data);
return -EINVAL;
}
@@ -78,6 +79,7 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
if ((mux_reg == -1) || (conf_reg == -1)) {
dev_err(dev, "Error mux_reg or conf_reg\n");
+ devm_kfree(dev, pin_data);
return -EINVAL;
}
@@ -166,6 +168,8 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)
}
}
+ devm_kfree(dev, pin_data);
+
return 0;
}