diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-03 22:42:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-04 16:50:16 +0100 |
| commit | aa59802dedac98dc95310a456121cec6a9d6b63f (patch) | |
| tree | a11ba91bd5636199d7c83ca93bdadc27acfc3e83 | |
| parent | 38f3f31a0a797bdbcc0cdb12553bbecc2f9a91c4 (diff) | |
| download | blackbird-op-linux-aa59802dedac98dc95310a456121cec6a9d6b63f.tar.gz blackbird-op-linux-aa59802dedac98dc95310a456121cec6a9d6b63f.zip | |
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>
| -rw-r--r-- | drivers/regulator/core.c | 9 |
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); |
