diff options
| author | Nishanth Menon <nm@ti.com> | 2013-04-16 16:45:16 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 14:58:17 +0100 |
| commit | 1e4b545cdd93318379c6b1fb0a99536fa3260f53 (patch) | |
| tree | ff314a75ecf106aef718f1160d2dd9064ca7ebb9 | |
| parent | 0f7b87f0acc04e4f22ec5d3f2283a80993ca3aa8 (diff) | |
| download | linux-1e4b545cdd93318379c6b1fb0a99536fa3260f53.tar.bz2 | |
regulator: core: return err value for regulator_get if there is no DT binding
commit 6d191a5fc7a969d972f1681e1c23781aecb06a61
(regulator: core: Don't defer probe if there's no DT binding for a supply)
Attempted to differentiate between regulator_get() with an actual
DT binding for the supply and when there is none to avoid unnecessary
deferal.
However, ret value supplied by regulator_dev_lookup() is being
ignored by regulator_get(). So, exit with the appropriate return value.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | drivers/regulator/core.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a51e1e5fdff3..73edb0ef6e17 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1229,7 +1229,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, struct regulator_dev *rdev; struct regulator *regulator = ERR_PTR(-EPROBE_DEFER); const char *devname = NULL; - int ret; + int ret = 0; if (id == NULL) { pr_err("get() with no identifier\n"); @@ -1245,6 +1245,15 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, if (rdev) goto found; + /* + * If we have return value from dev_lookup fail, we do not expect to + * succeed, so, quit with appropriate error value + */ + if (ret) { + regulator = ERR_PTR(ret); + goto out; + } + if (board_wants_dummy_regulator) { rdev = dummy_regulator_rdev; goto found; |