---

yaml --- r: 323312 b: refs/heads/master c: 2b5a24a h: refs/heads/master v: v3
git-mirror · Sep 8, 2012 · b76fa93 · b76fa93
1 parent 4a521fa
commit b76fa93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);