diff --git a/[refs] b/[refs]
index f481041ee9e2..e88934c3367e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98a175b60f46a80dfa44fb0e0807f2e5a351f35f
+refs/heads/master: 23ca6bf2318fecfbb9cd9d524e82d5029ef365bf
diff --git a/trunk/drivers/regulator/max77686.c b/trunk/drivers/regulator/max77686.c
index b0c146df42d1..2dd4ac91d283 100644
--- a/trunk/drivers/regulator/max77686.c
+++ b/trunk/drivers/regulator/max77686.c
@@ -77,7 +77,7 @@ static int max77686_set_dvs_voltage_time_sel(struct regulator_dev *rdev,
 
 	return DIV_ROUND_UP(rdev->desc->uV_step *
 			    abs(new_selector - old_selector),
-			    ramp_rate[max77686->ramp_delay]);
+			    ramp_rate[max77686->ramp_delay] * 1000);
 }
 
 static int max77686_set_voltage_time_sel(struct regulator_dev *rdev,
@@ -85,7 +85,7 @@ static int max77686_set_voltage_time_sel(struct regulator_dev *rdev,
 {
 	/* Unconditionally 100 mV/us */
 	return DIV_ROUND_UP(rdev->desc->uV_step *
-			    abs(new_selector - old_selector), 100);
+			    abs(new_selector - old_selector), 100 * 1000);
 }
 
 static struct regulator_ops max77686_ops = {