diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-02-13 16:20:07 +0100 |
| commit | 654b0c9627bc1b34cc21643afa8ac359c50db7d7 (patch) | |
| tree | f25069e2987e6d61793585adf969f42f9380afcd /drivers/regulator/of_regulator.c | |
| parent | d031e1de2c5ba91e67ed83f6adf624543ab2b03d (diff) | |
| parent | d020283dc694c9ec31b410f522252f7a8397e67d (diff) | |
Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos
New material in the pm-qos branch depends on recent power management
fixes.
Diffstat (limited to 'drivers/regulator/of_regulator.c')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 2 |
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); |