---

yaml --- r: 312531 b: refs/heads/master c: 23ca6bf h: refs/heads/master i: 312529: 3c100d7 312527: 42202f9 v: v3
git-mirror · Jun 11, 2012 · 759425e · 759425e
1 parent 79b9c96
commit 759425e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -77,15 +77,15 @@ 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,
 			unsigned int old_selector, unsigned int new_selector)
 {
 	/* 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 = {