diff --git a/[refs] b/[refs]
index e88934c3367e..0e52f47657b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23ca6bf2318fecfbb9cd9d524e82d5029ef365bf
+refs/heads/master: 578df8babf3b1895d562e1ea0d3a81d1e77e0182
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index ff76abde3ab3..6ffca9b32388 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2299,7 +2299,7 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 	if (rdev->desc->ramp_delay && rdev->desc->uV_step)
 		return DIV_ROUND_UP(rdev->desc->uV_step *
 			abs(new_selector - old_selector),
-			rdev->desc->ramp_delay) * 1000;
+			rdev->desc->ramp_delay * 1000);
 	return 0;
 }