Merge tag 'v3.3-rc7' into x86/mce

Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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);