Commit 74429366 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Linus Walleij

pinctrl: imx: fix assigning groups names

This fixes regression caused by incorrect array indexing.
Reported-by: default avatarFabio Estevam <festevam@gmail.com>
Fixes: 02f11713 ("pinctrl: imx: prepare for making "group_names" in "function_desc" const")
Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Tested-by: default avatarFabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20211227122237.6363-1-zajec5@gmail.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 79dcd4e8
......@@ -649,7 +649,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
struct function_desc *func;
struct group_desc *grp;
const char **group_names;
u32 i = 0;
u32 i;
dev_dbg(pctl->dev, "parse function(%d): %pOFn\n", index, np);
......@@ -669,10 +669,12 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
sizeof(char *), GFP_KERNEL);
if (!group_names)
return -ENOMEM;
i = 0;
for_each_child_of_node(np, child)
group_names[i] = child->name;
group_names[i++] = child->name;
func->group_names = group_names;
i = 0;
for_each_child_of_node(np, child) {
grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
GFP_KERNEL);
......
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