From 582b94889f52e041ad7be20ad329b5c6251c1e28 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 11 Feb 2010 17:22:45 +0000
Subject: [PATCH] --- yaml --- r: 185665 b: refs/heads/master c:
 9a7f6a4c6edc84748c6477c9df56691a0e61b8fd h: refs/heads/master i:   185663:
 7834d4c9b9285b56d74deda08bb1651dd09f4708 v: v3

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

diff --git a/[refs] b/[refs]
index d56d703b2592..61c557ec2f9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17133dc82422cb118c843c3e9bbd565c37506ec8
+refs/heads/master: 9a7f6a4c6edc84748c6477c9df56691a0e61b8fd
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index ca8e1642538b..75a26f780918 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1466,9 +1466,9 @@ EXPORT_SYMBOL_GPL(regulator_force_disable);
 
 static int _regulator_is_enabled(struct regulator_dev *rdev)
 {
-	/* sanity check */
+	/* If we don't know then assume that the regulator is always on */
 	if (!rdev->desc->ops->is_enabled)
-		return -EINVAL;
+		return 1;
 
 	return rdev->desc->ops->is_enabled(rdev);
 }