Skip to contentSkip to conversation

pinctrl: equilibrium: Fix function addition in multiple groups

PATCH New Rahul Tanwar 1 participant 1 message Oct 20, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: equilibrium: Fix function addition in multiple groups

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

Fixes 1948d5c51dba ("pinctrl: Add pinmux & GPIO controller driver for a new SoC")
---
 drivers/pinctrl/pinctrl-equilibrium.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pinctrl/pinctrl-equilibrium.c +6 -1
index fb713f9c53d0..3f0143087cc7 100644
@@ -675,6 +675,11 @@ static int eqbr_build_functions(struct eqbr_pinctrl_drv_data *drvdata)
 		return ret;
 
 	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,
 						  funcs[i].name,
 						  funcs[i].groups,
@@ -815,7 +820,7 @@ static int pinctrl_reg(struct eqbr_pinctrl_drv_data *drvdata)
 
 	ret = eqbr_build_functions(drvdata);
 	if (ret) {
-		dev_err(dev, "Failed to build groups\n");
+		dev_err(dev, "Failed to build functions\n");
 		return ret;
 	}
 
Signature · 1 line
2.17.1