summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-27 15:23:10 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-03 21:28:33 +0200
commit79511ed3225a64f6b7fc749f4f9c1ed82f24f729 (patch)
treed800dbefea3fc15dde99d1ad6f024cfc63e441a7 /drivers
parentregulator: dt: regulator match by regulator-compatible (diff)
downloadlinux-79511ed3225a64f6b7fc749f4f9c1ed82f24f729.tar.xz
linux-79511ed3225a64f6b7fc749f4f9c1ed82f24f729.zip
regulator: core: Allow fixed enable_time to be set in the regulator_desc
Many regulators have a fixed specification for their enable time. Allow this to be set in the regulator_desc as a number to save them having to implement an explicit operation. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index aa82c0465f4f..6e488aa6f1e8 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1189,7 +1189,7 @@ overflow_err:
static int _regulator_get_enable_time(struct regulator_dev *rdev)
{
if (!rdev->desc->ops->enable_time)
- return 0;
+ return rdev->desc->enable_time;
return rdev->desc->ops->enable_time(rdev);
}