From 759425e4802d8522fb253067f7dd508d3e9c21e4 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 8 Jun 2012 17:21:44 +0800 Subject: [PATCH] --- yaml --- r: 312531 b: refs/heads/master c: 23ca6bf2318fecfbb9cd9d524e82d5029ef365bf h: refs/heads/master i: 312529: 3c100d7f90325b6f26086e72fceea48773ee3fdc 312527: 42202f914863572b3a76491f19caad53a9bdeede v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max77686.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f481041ee9e2..e88934c3367e 100644 --- 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 index b0c146df42d1..2dd4ac91d283 100644 --- a/trunk/drivers/regulator/max77686.c +++ b/trunk/drivers/regulator/max77686.c @@ -77,7 +77,7 @@ 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, @@ -85,7 +85,7 @@ static int max77686_set_voltage_time_sel(struct regulator_dev *rdev, { /* 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 = {