lkml.org 
[lkml]   [2014]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] regulator: core: Correct default return value for full constraints
Liam,

Can you please review / apply this patch? It fixes a real bug. I also
think it should go to the 3.13-stable tree.

Thanks,
Jean

On Mon, 27 Jan 2014 18:07:55 +0000, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> Once we have full constraints then all supply mappings should be known to
> the regulator API. This means that we should treat failed lookups as fatal
> rather than deferring in the hope of further registrations but this was
> broken by commit 9b92da1f1205bd25 "regulator: core: Fix default return
> value for _get()" which was targeted at DT systems but unintentionally
> broke non-DT systems by changing the default return value.
>
> Fix this by explicitly returning -EPROBE_DEFER from the DT lookup if we
> find a property but no corresponding regulator and by having the non-DT
> case default to -ENODEV when we have full constraints.
>
> Fixes: 9b92da1f1205bd25 "regulator: core: Fix default return value for _get()"
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
> drivers/regulator/core.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index b38a6b669e8c..16a309e5c024 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -1272,6 +1272,8 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev,
> if (r->dev.parent &&
> node == r->dev.of_node)
> return r;
> + *ret = -EPROBE_DEFER;
> + return NULL;
> } else {
> /*
> * If we couldn't even get the node then it's
> @@ -1312,7 +1314,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 = -EPROBE_DEFER;
> + int ret;
>
> if (id == NULL) {
> pr_err("get() with no identifier\n");
> @@ -1322,6 +1324,11 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
> if (dev)
> devname = dev_name(dev);
>
> + if (have_full_constraints())
> + ret = -ENODEV;
> + else
> + ret = -EPROBE_DEFER;
> +
> mutex_lock(&regulator_list_mutex);
>
> rdev = regulator_dev_lookup(dev, id, &ret);


--
Jean Delvare


\
 
 \ /
  Last update: 2014-02-03 11:21    [W:0.099 / U:0.316 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site