Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-…
Browse files Browse the repository at this point in the history 
…next
  • Loading branch information
Mark Brown committed Dec 10, 2012
2 parents 8ee0051 + 43f1f21 commit 925f14d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/regulator/wm831x-dcdc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ static int wm831x_buckv_map_voltage(struct regulator_dev *rdev,
if (min_uV < 600000)
vsel = 0;
else if (min_uV <= 1800000)
vsel = ((min_uV - 600000) / 12500) + 8;
vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8;
else
return -EINVAL;

Expand Down Expand Up @@ -993,4 +993,5 @@ MODULE_DESCRIPTION("WM831x DC-DC convertor driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:wm831x-buckv");
MODULE_ALIAS("platform:wm831x-buckp");
MODULE_ALIAS("platform:wm831x-boostp");
MODULE_ALIAS("platform:wm831x-epe");

0 comments on commit 925f14d

Please sign in to comment.