Skip to contentSkip to conversation

regulator: core: Correct return value check in regulator_resolve_supply

PATCH New Charles Keepax 1 participant 1 message Sep 17, 2015 Voltage and current regulator framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 regulator: core: Correct return value check in regulator_resolve_supply

The ret pointer passed to regulator_dev_lookup is only filled with a valid error code if regulator_dev_lookup returned NULL. Currently regulator_resolve_supply checks this ret value before it checks if a regulator was returned, this can result in valid regulator lookups being ignored.

Fixes 6261b06de565 ("regulator: Defer lookup of supply to regulator_get")
---
 drivers/regulator/core.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/regulator/core.c +8 -8
index b616d34a..e5dbbe2f 100644
@@ -1394,15 +1394,15 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
 		return 0;
 
 	r = regulator_dev_lookup(dev, rdev->supply_name, &ret);
-	if (ret == -ENODEV) {
-		/*
-		 * No supply was specified for this regulator and
-		 * there will never be one.
-		 */
-		return 0;
-	}
-
 	if (!r) {
+		if (ret == -ENODEV) {
+			/*
+			 * No supply was specified for this regulator and
+			 * there will never be one.
+			 */
+			return 0;
+		}
+
 		if (have_full_constraints()) {
 			r = dummy_regulator_rdev;
 		} else {
Signature · 1 line
1.7.2.5