From b76fa9379c95dee6e849592341817b0a47f042c5 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 7 Sep 2012 11:00:53 +0800
Subject: [PATCH] --- yaml --- r: 323312 b: refs/heads/master c:
 2b5a24a01df12fbfa3e702ad7efae27bcb852e33 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ce691f3ed3f..be68152ce6ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2889e650a8dbd51644997aef7bae71d6ac4d423
+refs/heads/master: 2b5a24a01df12fbfa3e702ad7efae27bcb852e33
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 50977a69f09a..ed376d9f525d 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1724,6 +1724,9 @@ int regulator_disable_deferred(struct regulator *regulator, int ms)
 	if (regulator->always_on)
 		return 0;
 
+	if (!ms)
+		return regulator_disable(regulator);
+
 	mutex_lock(&rdev->mutex);
 	rdev->deferred_disables++;
 	mutex_unlock(&rdev->mutex);