aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-12-27 13:22:37 +0100
committerLinus Walleij <linus.walleij@linaro.org>2022-01-02 07:33:51 +0100
commit7442936633bd1906a2571116ae334b68c56c8a72 (patch)
treeec502305e13c587a9cb506597cc81e2c0855691b
parent79dcd4e840ccfaf8018ec96415fdc0250e945c77 (diff)
pinctrl: imx: fix assigning groups namespinctrl-v5.17-1
This fixes regression caused by incorrect array indexing. Reported-by: Fabio Estevam <festevam@gmail.com> Fixes: 02f117134952 ("pinctrl: imx: prepare for making "group_names" in "function_desc" const") Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Tested-by: Fabio Estevam <festevam@gmail.com> Link: https://lore.kernel.org/r/20211227122237.6363-1-zajec5@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/freescale/pinctrl-imx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 16bc1bfc03e4..fa3cc0b80ede 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -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);