diff --git a/[refs] b/[refs]
index fa581718cd06..8f1610253687 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 684ae39b91ee7fd2855c35be7f3bf226d42516a5
+refs/heads/master: ccfcb1c3cf5616ebd9c61e6c834af3b87fe6b7f7
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 5751f5ed47c0..8918271f9e85 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2047,7 +2047,7 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev,
 		return -EINVAL;
 	}
 
-	ret = (min_uV - rdev->desc->min_uV) / rdev->desc->uV_step;
+	ret = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step);
 	if (ret < 0)
 		return ret;