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);
 }