From c8dad3f4155a75a4975119a8b196c7c45a712831 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 14 May 2012 00:40:14 +0100
Subject: [PATCH] --- yaml --- r: 302285 b: refs/heads/master c:
 b1a868310e7024650918119d292129446b2f8336 h: refs/heads/master i:   302283:
 6677d0f671132009368eeb578eef7ee934fc7533 v: v3

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

diff --git a/[refs] b/[refs]
index 018231e67b62..2272343d6e54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0b067d9b6474e5309dd47ab30264cd0a48d4963
+refs/heads/master: b1a868310e7024650918119d292129446b2f8336
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 5a33282181d8..faa053278194 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -3160,8 +3160,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
 			goto scrub;
 
 		/* Enable supply if rail is enabled */
-		if (rdev->desc->ops->is_enabled &&
-				rdev->desc->ops->is_enabled(rdev)) {
+		if (_regulator_is_enabled(rdev)) {
 			ret = regulator_enable(rdev->supply);
 			if (ret < 0)
 				goto scrub;
@@ -3293,7 +3292,7 @@ int regulator_suspend_finish(void)
 				goto unlock;
 			if (!ops->disable)
 				goto unlock;
-			if (ops->is_enabled && !ops->is_enabled(rdev))
+			if (!_regulator_is_enabled(rdev))
 				goto unlock;
 
 			error = ops->disable(rdev);