xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: equilibrium: Fix function addition in multiple groups

Browse Source 
[ Upstream commit 53b3947ddb7f309d1f611f8dc9bfd6ea9d699907 ]

Ignore the same function with multiple groups.
Fix a typo in error print.

Fixes: 1948d5c51d ("pinctrl: Add pinmux & GPIO controller driver for a new SoC")
Signed-off-by: Rahul Tanwar <rtanwar@maxlinear.com>
Link: https://lore.kernel.org/r/20211020093815.20870-1-rtanwar@maxlinear.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Rahul Tanwar
2021-10-20 17:38:15 +08:00
committed by Greg Kroah-Hartman
parent a0467ca4d2
commit ec40a28495
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pinctrl/pinctrl-equilibrium.c
View File

@@ -674,6 +674,11 @@ static int eqbr_build_functions(struct eqbr_pinctrl_drv_data *drvdata)
return ret; return ret;
for (i = 0; i < nr_funcs; i++) { for (i = 0; i < nr_funcs; i++) {
/* Ignore the same function with multiple groups */
if (funcs[i].name == NULL)
continue;
ret = pinmux_generic_add_function(drvdata->pctl_dev, ret = pinmux_generic_add_function(drvdata->pctl_dev,
funcs[i].name, funcs[i].name,
funcs[i].groups, funcs[i].groups,
@@ -805,7 +810,7 @@ static int pinctrl_reg(struct eqbr_pinctrl_drv_data *drvdata)
ret = eqbr_build_functions(drvdata); ret = eqbr_build_functions(drvdata);
if (ret) { if (ret) {
dev_err(dev, "Failed to build groups\n"); dev_err(dev, "Failed to build functions\n");
return ret; return ret;
} }