From: Mark Brown <broonie@kernel.org>
Date: Tue, 12 Jan 2016 18:26:05 +0000 (+0000)
Subject: Merge remote-tracking branches 'regulator/topic/const', 'regulator/topic/lm363x'... 
X-Git-Tag: v4.5-rc1~91^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8bd31df8de3351465c5d202d1a6f0da5834726b9;p=linux.git

Merge remote-tracking branches 'regulator/topic/const', 'regulator/topic/lm363x', 'regulator/topic/lockdep' and 'regulator/topic/lp872x' into regulator-next
---

8bd31df8de3351465c5d202d1a6f0da5834726b9
diff --cc drivers/regulator/core.c
index 09af2aafb2c1,73b7683355cd,73b7683355cd,732ac71b82cd,73b7683355cd..4753f5f43fa5
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@ -138,10 -138,18 -138,18 -146,10 -138,18 +146,10 @@@@@@ static inline struct regulator_dev *rde
      */
     static void regulator_lock_supply(struct regulator_dev *rdev)
     {
 -- -	struct regulator *supply;
 -- -	int i = 0;
 -- -
 -- -	while (1) {
 -- -		mutex_lock_nested(&rdev->mutex, i++);
 -- -		supply = rdev->supply;
 -- -
 -- -		if (!rdev->supply)
 -- -			return;
 ++ +	int i;
     
-    	for (i = 0; rdev->supply; rdev = rdev->supply->rdev, i++)
 -- -		rdev = supply->rdev;
 -- -	}
+++ +	for (i = 0; rdev; rdev = rdev_get_supply(rdev), i++)
 ++ +		mutex_lock_nested(&rdev->mutex, i);
     }
     
     /**