1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f3c8f8f9dc39..7827384680d6 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -21,6 +21,7 @@ static void of_get_regulation_constraints(struct device_node *np,
 {
         const __be32 *min_uV, *max_uV, *uV_offset;
         const __be32 *min_uA, *max_uA, *ramp_delay;
+        struct property *prop;
         struct regulation_constraints *constraints = &(*init_data)->constraints;
 
         constraints->name = of_get_property(np, "regulator-name", NULL);
@@ -64,9 +65,14 @@ static void of_get_regulation_constraints(struct device_node *np,
         if (of_property_read_bool(np, "regulator-allow-bypass"))
                 constraints->valid_ops_mask |= REGULATOR_CHANGE_BYPASS;
 
-        ramp_delay = of_get_property(np, "regulator-ramp-delay", NULL);
-        if (ramp_delay)
-                constraints->ramp_delay = be32_to_cpu(*ramp_delay);
+        prop = of_find_property(np, "regulator-ramp-delay", NULL);
+        if (prop && prop->value) {
+                ramp_delay = prop->value;
+                if (*ramp_delay)
+                        constraints->ramp_delay = be32_to_cpu(*ramp_delay);
+                else
+                        constraints->ramp_disable = true;
+        }
 }
 
 /**