lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: Fix return code from regulator_disable_deferred()

Browse Source 
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>
This commit is contained in:
Mark Brown
2011-10-03 22:42:43 +01:00
parent 38f3f31a0a
commit aa59802ded
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/regulator/core.c
View File

@@ -1599,13 +1599,18 @@ static void regulator_disable_work(struct work_struct *work)
int regulator_disable_deferred(struct regulator *regulator, int ms) int regulator_disable_deferred(struct regulator *regulator, int ms)
{ {
struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *rdev = regulator->rdev;
int ret;
mutex_lock(&rdev->mutex); mutex_lock(&rdev->mutex);
rdev->deferred_disables++; rdev->deferred_disables++;
mutex_unlock(&rdev->mutex); mutex_unlock(&rdev->mutex);
return schedule_delayed_work(&rdev->disable_work, ret = schedule_delayed_work(&rdev->disable_work,
msecs_to_jiffies(ms)); msecs_to_jiffies(ms));
if (ret < 0)
return ret;
else
return 0;
} }
EXPORT_SYMBOL_GPL(regulator_disable_deferred); EXPORT_SYMBOL_GPL(regulator_disable_deferred);