---

yaml --- r: 292054 b: refs/heads/master c: 0f8b9c7 h: refs/heads/master v: v3
git-mirror · Mar 11, 2012 · 88c64b9 · 88c64b9
1 parent 30a4da5
commit 88c64b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 394ee3d5bea96b6dd29ec42a797d1ee4c2af5f1d
+refs/heads/master: 0f8b9c774442fa0ada36e5a0de9567588cc964cd
diff --git a/trunk/drivers/regulator/s5m8767.c b/trunk/drivers/regulator/s5m8767.c
@@ -457,7 +457,7 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev,
 
 	if (old_sel < new_sel)
 		return DIV_ROUND_UP(desc->step * (new_sel - old_sel),
-					s5m8767->ramp_delay);
+					s5m8767->ramp_delay * 1000);
 	return 0;
 }