hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pinctrl: tegra-xusb: Don't leak configurations 

The pinctrl config helpers make a separate copy of the configuration, so
callers must make sure to free any dynamically allocated memory that was
used to store it.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Thierry Reding 2014-10-16 12:12:22 +02:00 committed by Linus Walleij
parent 9067bbe598
commit c61c2d7071
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pinctrl/pinctrl-tegra-xusb.c
View File

@ -20,6 +20,7 @@
#include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/pinmux.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/slab.h>
#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h> #include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
@ -171,7 +172,7 @@ static int tegra_xusb_padctl_parse_subnode(struct tegra_xusb_padctl *padctl,
if (err == -EINVAL) if (err == -EINVAL)
continue; continue;
return err; goto out;
} }
config = TEGRA_XUSB_PADCTL_PACK(properties[i].param, value); config = TEGRA_XUSB_PADCTL_PACK(properties[i].param, value);
@ -179,7 +180,7 @@ static int tegra_xusb_padctl_parse_subnode(struct tegra_xusb_padctl *padctl,
err = pinctrl_utils_add_config(padctl->pinctrl, &configs, err = pinctrl_utils_add_config(padctl->pinctrl, &configs,
&num_configs, config); &num_configs, config);
if (err < 0) if (err < 0)
return err; goto out;
} }
if (function) if (function)
@ -190,14 +191,14 @@ static int tegra_xusb_padctl_parse_subnode(struct tegra_xusb_padctl *padctl,
err = of_property_count_strings(np, "nvidia,lanes"); err = of_property_count_strings(np, "nvidia,lanes");
if (err < 0) if (err < 0)
return err; goto out;
reserve *= err; reserve *= err;
err = pinctrl_utils_reserve_map(padctl->pinctrl, maps, reserved_maps, err = pinctrl_utils_reserve_map(padctl->pinctrl, maps, reserved_maps,
num_maps, reserve); num_maps, reserve);
if (err < 0) if (err < 0)
return err; goto out;
of_property_for_each_string(np, "nvidia,lanes", prop, group) { of_property_for_each_string(np, "nvidia,lanes", prop, group) {
if (function) { if (function) {
@ -205,7 +206,7 @@ static int tegra_xusb_padctl_parse_subnode(struct tegra_xusb_padctl *padctl,
reserved_maps, num_maps, group, reserved_maps, num_maps, group,
function); function);
if (err < 0) if (err < 0)
return err; goto out;
} }
if (num_configs) { if (num_configs) {
@ -214,11 +215,15 @@ static int tegra_xusb_padctl_parse_subnode(struct tegra_xusb_padctl *padctl,
configs, num_configs, configs, num_configs,
PIN_MAP_TYPE_CONFIGS_GROUP); PIN_MAP_TYPE_CONFIGS_GROUP);
if (err < 0) if (err < 0)
return err; goto out;
} }
} }
return 0; err = 0;
out:
kfree(configs);
return err;
} }
static int tegra_xusb_padctl_dt_node_to_map(struct pinctrl_dev *pinctrl, static int tegra_xusb_padctl_dt_node_to_map(struct pinctrl_dev *pinctrl,