diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-05-20 21:39:08 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-03 08:25:03 -0400 |
commit | 6333e9ddf4787ec42cbb4cbb482168094e54b337 (patch) | |
tree | 7d7126c172505a841dafeec40889f02f5d6a7d8e /drivers/regulator/ab8500.c | |
parent | cad8d76e20eda5ccfcfbccdd711b91e053b4ab05 (diff) |
regulator: ab8500: Let regulator core handle the case no delay for setting new voltage if regulator is off
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/ab8500.c')
-rw-r--r-- | drivers/regulator/ab8500.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index da883e661b38..f15807449011 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -256,14 +256,7 @@ static int ab8500_regulator_set_voltage_time_sel(struct regulator_dev *rdev, | |||
256 | unsigned int new_sel) | 256 | unsigned int new_sel) |
257 | { | 257 | { |
258 | struct ab8500_regulator_info *info = rdev_get_drvdata(rdev); | 258 | struct ab8500_regulator_info *info = rdev_get_drvdata(rdev); |
259 | int ret; | ||
260 | 259 | ||
261 | /* If the regulator isn't on, it won't take time here */ | ||
262 | ret = ab8500_regulator_is_enabled(rdev); | ||
263 | if (ret < 0) | ||
264 | return ret; | ||
265 | if (!ret) | ||
266 | return 0; | ||
267 | return info->delay; | 260 | return info->delay; |
268 | } | 261 | } |
269 | 262 | ||