diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-15 07:33:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-15 07:33:05 -0700 |
| commit | e643ee5a1bf4bd64d283298d3861e38893d84f94 (patch) | |
| tree | f9310242d7f05f514d42aec19d4ac6eacc323592 | |
| parent | d2477562f0a6aeb3db800e1051e7902602719066 (diff) | |
| parent | f6a5df1fdfd454210c7bf62386e8944e670645a3 (diff) | |
Merge "regulator: core: Fix nested locking of supplies"
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d49d8606da15..27a5deb1213e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -150,7 +150,7 @@ static void regulator_lock_supply(struct regulator_dev *rdev) { int i; - for (i = 0; rdev->supply; rdev = rdev_get_supply(rdev), i++) + for (i = 0; rdev; rdev = rdev_get_supply(rdev), i++) mutex_lock_nested(&rdev->mutex, i); } |