---

yaml --- r: 222783 b: refs/heads/master c: 3aa713e h: refs/heads/master i: 222781: ade798a 222779: 0fe6e1c 222775: 57f0b22 222767: 64709d5 222751: f48a3a6 222719: f858628 v: v3
git-mirror · Nov 30, 2010 · 8e9b032 · 8e9b032
1 parent 2d50b71
commit 8e9b032
Show file tree

Hide file tree

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