---

yaml --- r: 302285 b: refs/heads/master c: b1a8683 h: refs/heads/master i: 302283: 6677d0f v: v3
git-mirror · May 14, 2012 · c8dad3f · c8dad3f
1 parent d6f5090
commit c8dad3f
Show file tree

Hide file tree

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