diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-23 11:12:52 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-24 05:37:55 -0400 |
commit | ef60abbb6b406389245225ab4acfe73f66e7d92c (patch) | |
tree | e970f214516fc89097c4ed2464f96700756e7867 | |
parent | 9b92da1f1205bd2591487051a93624dd6c258eef (diff) |
regulator: core: Always use return value when regulator_dev_lookup() fails
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.
Reported-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/regulator/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 088b41ac9506..a40055edaae4 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -1263,12 +1263,13 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, | |||
1263 | if (rdev) | 1263 | if (rdev) |
1264 | goto found; | 1264 | goto found; |
1265 | 1265 | ||
1266 | regulator = ERR_PTR(ret); | ||
1267 | |||
1266 | /* | 1268 | /* |
1267 | * If we have return value from dev_lookup fail, we do not expect to | 1269 | * If we have return value from dev_lookup fail, we do not expect to |
1268 | * succeed, so, quit with appropriate error value | 1270 | * succeed, so, quit with appropriate error value |
1269 | */ | 1271 | */ |
1270 | if (ret && ret != -ENODEV) { | 1272 | if (ret && ret != -ENODEV) { |
1271 | regulator = ERR_PTR(ret); | ||
1272 | goto out; | 1273 | goto out; |
1273 | } | 1274 | } |
1274 | 1275 | ||