summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorKarol Lewandowski <k.lewandowsk@samsung.com>2012-01-25 10:31:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-26 11:01:21 +0000
commit8a093049c604ab32d94bcc5baa24f7939d5e3f7b (patch)
treec8cef25e6b14d5469f87990e9799fd3552ee1ca1 /drivers/regulator
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
downloadlinux-8a093049c604ab32d94bcc5baa24f7939d5e3f7b.tar.gz
linux-8a093049c604ab32d94bcc5baa24f7939d5e3f7b.tar.bz2
linux-8a093049c604ab32d94bcc5baa24f7939d5e3f7b.zip
regulator: Set apply_uV only when min and max voltages are defined
apply_uV is errornously set when regulator is instantiated from device tree, even when it doesn't contain any voltage constraints. This commit fixes error: machine_constraints_voltage: CHARGER: failed to apply 0uV constraint for following regulator description in DTS: CHARGER { regulator-min-microamp = <100000>; regulator-max-microamp = <200000>; } Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/of_regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f1651eb69648..679734d26a16 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np,
if (constraints->min_uV != constraints->max_uV)
constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
/* Only one voltage? Then make sure it's set. */
- if (constraints->min_uV == constraints->max_uV)
+ if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
constraints->apply_uV = true;
uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);