* [PATCH] regulator: Fix return code from regulator_disable_deferred()
@ 2011-10-03 21:46 Mark Brown
0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2011-10-03 21:46 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-kernel, patches, Mark Brown
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>
---
I'll queue this up along with the addition of the call in ASoC - please
say if this is a problem.
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 b39ec9f..0c6d301 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1600,13 +1600,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);
--
1.7.6.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-03 21:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-03 21:46 [PATCH] regulator: Fix return code from regulator_disable_deferred() Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®