Commit e43d2b75 authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Linus Walleij

pinctrl: at91-pio4: fix memleak after using dt map

configs is allocated by pinconf_generic_parse_dt_config(),
pinctrl_utils_add_map_configs() duplicates configs so it can and has to
be freed to prevent memory leaks.
Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Reported-by: default avatarYingjoe Chen <yingjoe.chen@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent df8801a0
...@@ -500,7 +500,8 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -500,7 +500,8 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (!num_pins) { if (!num_pins) {
dev_err(pctldev->dev, "no pins found in node %s\n", dev_err(pctldev->dev, "no pins found in node %s\n",
of_node_full_name(np)); of_node_full_name(np));
return -EINVAL; ret = -EINVAL;
goto exit;
} }
/* /*
...@@ -514,19 +515,19 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -514,19 +515,19 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps, ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps,
reserve); reserve);
if (ret < 0) if (ret < 0)
return ret; goto exit;
for (i = 0; i < num_pins; i++) { for (i = 0; i < num_pins; i++) {
const char *group, *func; const char *group, *func;
ret = of_property_read_u32_index(np, "pinmux", i, &pinfunc); ret = of_property_read_u32_index(np, "pinmux", i, &pinfunc);
if (ret) if (ret)
return ret; goto exit;
ret = atmel_pctl_xlate_pinfunc(pctldev, np, pinfunc, &group, ret = atmel_pctl_xlate_pinfunc(pctldev, np, pinfunc, &group,
&func); &func);
if (ret) if (ret)
return ret; goto exit;
pinctrl_utils_add_map_mux(pctldev, map, reserved_maps, num_maps, pinctrl_utils_add_map_mux(pctldev, map, reserved_maps, num_maps,
group, func); group, func);
...@@ -537,11 +538,13 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ...@@ -537,11 +538,13 @@ static int atmel_pctl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
configs, num_configs, configs, num_configs,
PIN_MAP_TYPE_CONFIGS_GROUP); PIN_MAP_TYPE_CONFIGS_GROUP);
if (ret < 0) if (ret < 0)
return ret; goto exit;
} }
} }
return 0; exit:
kfree(configs);
return ret;
} }
static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, static int atmel_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment