summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-04 01:42:43 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-04 19:50:16 +0400
commitaa59802dedac98dc95310a456121cec6a9d6b63f (patch)
treea11ba91bd5636199d7c83ca93bdadc27acfc3e83 /drivers/regulator
parent38f3f31a0a797bdbcc0cdb12553bbecc2f9a91c4 (diff)
downloadlinux-aa59802dedac98dc95310a456121cec6a9d6b63f.tar.xz
regulator: Fix return code from regulator_disable_deferred()
schedule_delayed_work() returns a bool indicating if the work was already queued when it succeeds so we need to squash a true down to zero. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index d0bde70f3466..9e4c123c4028 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1599,13 +1599,18 @@ static void regulator_disable_work(struct work_struct *work)
int regulator_disable_deferred(struct regulator *regulator, int ms)
{
struct regulator_dev *rdev = regulator->rdev;
+ int ret;
mutex_lock(&rdev->mutex);
rdev->deferred_disables++;
mutex_unlock(&rdev->mutex);
- return schedule_delayed_work(&rdev->disable_work,
- msecs_to_jiffies(ms));
+ ret = schedule_delayed_work(&rdev->disable_work,
+ msecs_to_jiffies(ms));
+ if (ret < 0)
+ return ret;
+ else
+ return 0;
}
EXPORT_SYMBOL_GPL(regulator_disable_deferred);