From 8e9b032e58d02ffcb5834b9a336c8f696218da39 Mon Sep 17 00:00:00 2001
From: Mattias Wallin <mattias.wallin@stericsson.com>
Date: Thu, 4 Nov 2010 11:01:31 +0100
Subject: [PATCH] --- yaml --- r: 222783 b: refs/heads/master c:
 3aa713e76e8f562c0d28faf18873c4f1836b17c9 h: refs/heads/master i:   222781:
 ade798a435b8e817c27853aaad53a2c0f6d01b5a   222779:
 0fe6e1c40e1b75d786e639eae0043de8b429d7e7   222775:
 57f0b2228b6750e36519d25bcafc794390c58910   222767:
 64709d59c1de4bdcd9b01091b66dcac6405abb74   222751:
 f48a3a6c513004d2fbb927a4f2aeee4c94c8d73a   222719:
 f858628c05c2cf2a7c4c3664ead73db24663958a v: v3

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

diff --git a/[refs] b/[refs]
index 36c1b46ee5b2..287df90bd7e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7727da22e820a96ab394db2fc0ab58f7f7ecb323
+refs/heads/master: 3aa713e76e8f562c0d28faf18873c4f1836b17c9
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 711fa1722bce..27d062e1395c 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -1269,7 +1269,9 @@ static int _regulator_enable(struct regulator_dev *rdev)
 
 	/* 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);