---

yaml --- r: 272417 b: refs/heads/master c: d1685e4 h: refs/heads/master i: 272415: 4be6788 v: v3
git-mirror · Oct 14, 2011 · 50dc26b · 50dc26b
1 parent c8846ce
commit 50dc26b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d162b3c54b206ee64c87651309ed4442846cafbc
+refs/heads/master: d1685e4e2c3854782272f32b71f2f3eff5c6e0d0
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -1425,7 +1425,7 @@ int regulator_enable(struct regulator *regulator)
 	ret = _regulator_enable(rdev);
 	mutex_unlock(&rdev->mutex);
 
-	if (ret != 0)
+	if (ret != 0 && rdev->supply)
 		regulator_disable(rdev->supply);
 
 	return ret;