Skip to contentSkip to conversation

pinctrl: single: Fix a couple error codes

PATCH In review Dan Carpenter 3 participants 3 messages Nov 16, 2016

Subsystems (4)
Kernel janitors GPIO Pin control Pin controller - single
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 pinctrl: single: Fix a couple error codes

We should return -ENOMEM instead of success if pcs_add_function() fails.

Signed-off-by Dan Carpenter <[email protected]>
drivers/pinctrl/pinctrl-single.c +6 -2
index 2b196e5..a5a0392 100644
@@ -1181,8 +1181,10 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
 
 	pgnames[0] = np->name;
 	function = pcs_add_function(pcs, np, np->name, vals, found, pgnames, 1);
-	if (!function)
+	if (!function) {
+		res = -ENOMEM;
 		goto free_pins;
+	}
 
 	res = pcs_add_pingroup(pcs, np, np->name, pins, found);
 	if (res < 0)

@@ -1313,8 +1315,10 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
 
 	pgnames[0] = np->name;
 	function = pcs_add_function(pcs, np, np->name, vals, found, pgnames, 1);
-	if (!function)
+	if (!function) {
+		res = -ENOMEM;
 		goto free_pins;
+	}
 
 	res = pcs_add_pingroup(pcs, np, np->name, pins, found);
 	if (res < 0)
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Dan Carpenter

We should return -ENOMEM instead of success if pcs_add_function() fails.

Looks good to me thanks:

Acked-by Tony Lindgren <[email protected]>
Quoted 30 lines
Signed-off-by Dan Carpenter <[email protected]>
drivers/pinctrl/pinctrl-single.c +6 -2
index 2b196e5..a5a0392 100644
@@ -1181,8 +1181,10 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
 
 	pgnames[0] = np->name;
 	function = pcs_add_function(pcs, np, np->name, vals, found, pgnames, 1);
-	if (!function)
+	if (!function) {
+		res = -ENOMEM;
 		goto free_pins;
+	}
 
 	res = pcs_add_pingroup(pcs, np, np->name, pins, found);
 	if (res < 0)

@@ -1313,8 +1315,10 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
 
 	pgnames[0] = np->name;
 	function = pcs_add_function(pcs, np, np->name, vals, found, pgnames, 1);
-	if (!function)
+	if (!function) {
+		res = -ENOMEM;
 		goto free_pins;
+	}
 
 	res = pcs_add_pingroup(pcs, np, np->name, pins, found);
 	if (res < 0)