From 50dc26b8ba4123451b0ac15143c61a537d30e2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <heiko@sntech.de>
Date: Fri, 14 Oct 2011 18:00:29 +0200
Subject: [PATCH] --- yaml --- r: 272417 b: refs/heads/master c:
 d1685e4e2c3854782272f32b71f2f3eff5c6e0d0 h: refs/heads/master i:   272415:
 4be67889d0e86f8e333d45566b4dd24477baa4dd v: v3

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

diff --git a/[refs] b/[refs]
index 9808e05eebc5..58ccb010722d 100644
--- 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
index 9a33fe2021b6..87d9328f1695 100644
--- 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;