Skip to contentSkip to conversation

regulator: core: Always use return value when regulator_dev_lookup() fails

PATCH In review Mark Brown 2 participants 2 messages Sep 23, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

PATCH 1/1 regulator: core: Always use return value when regulator_dev_lookup() fails

From: Mark Brown <[email protected]>

Ensure that the return value is always set when we return now that the logic has changed for regulator_get_optional() so we don't get missing codes leaking out.

---
 drivers/regulator/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/regulator/core.c +2 -1
index fabbf32..6333080 100644
@@ -1281,12 +1281,13 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
 	if (rdev)
 		goto found;
 
+	regulator = ERR_PTR(ret);
+
 	/*
 	 * If we have return value from dev_lookup fail, we do not expect to
 	 * succeed, so, quit with appropriate error value
 	 */
 	if (ret && ret != -ENODEV) {
-		regulator = ERR_PTR(ret);
 		goto out;
 	}
 
Signature · 1 line
1.8.4.rc3
Tested-by on v1 1/1
#1 lore raw
Quoted 20 lines · Mark Brown

From: Mark Brown <[email protected]>

Ensure that the return value is always set when we return now that the logic has changed for regulator_get_optional() so we don't get missing codes leaking out.

---
 drivers/regulator/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/regulator/core.c +0 -0
index fabbf32..6333080 100644
@@ -1281,12 +1281,13 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
 	if (rdev)
 		goto found;
 

drivers/regulator/core.c static struct regulator *_regulator_get(struct device *dev, const char *id, · line 1292

Quoted 10 lines
drivers/regulator/core.c +2 -1
+	regulator = ERR_PTR(ret);
+
 	/*
 	 * If we have return value from dev_lookup fail, we do not expect to
 	 * succeed, so, quit with appropriate error value
 	 */
 	if (ret && ret != -ENODEV) {
-		regulator = ERR_PTR(ret);
 		goto out;
 	}

Perhaps remove the { and } now that there's only the "goto out;" left?