From 3d1076eee0a65fc8dd650a773d97128fa8562c3e Mon Sep 17 00:00:00 2001
From: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Date: Wed, 10 Nov 2010 11:06:22 +0100
Subject: [PATCH] --- yaml --- r: 222785 b: refs/heads/master c:
 f3c18a87f3ddcfd31b16f689d01eb6adcc99de74 h: refs/heads/master i:   222783:
 8e9b032e58d02ffcb5834b9a336c8f696218da39 v: v3

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

diff --git a/[refs] b/[refs]
index 42420bd0ed9c..d881e7b7294b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9e26bc804e611d879353cd953cb17db1c52d307
+refs/heads/master: f3c18a87f3ddcfd31b16f689d01eb6adcc99de74
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 27d062e1395c..c577c6d344ac 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1267,15 +1267,17 @@ static int _regulator_enable(struct regulator_dev *rdev)
 {
 	int ret, delay;
 
-	/* do we need to enable the supply regulator first */
-	if (rdev->supply) {
-		mutex_lock(&rdev->supply->mutex);
-		ret = _regulator_enable(rdev->supply);
-		mutex_unlock(&rdev->supply->mutex);
-		if (ret < 0) {
-			printk(KERN_ERR "%s: failed to enable %s: %d\n",
-			       __func__, rdev_get_name(rdev), ret);
-			return ret;
+	if (rdev->use_count == 0) {
+		/* do we need to enable the supply regulator first */
+		if (rdev->supply) {
+			mutex_lock(&rdev->supply->mutex);
+			ret = _regulator_enable(rdev->supply);
+			mutex_unlock(&rdev->supply->mutex);
+			if (ret < 0) {
+				printk(KERN_ERR "%s: failed to enable %s: %d\n",
+				       __func__, rdev_get_name(rdev), ret);
+				return ret;
+			}
 		}
 	}