iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2016-01-12 18:26:05 +00:00
parent 9fa295742d b0d6dd3ba3 faa5cf3af3 70a7fb80e8 8a99cc6ff5
commit 8bd31df8de
19 changed files with 390 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/regulator/core.c
View File

@ -132,6 +132,14 @@ static bool have_full_constraints(void)
return has_full_constraints || of_have_populated_dt();
}
static inline struct regulator_dev *rdev_get_supply(struct regulator_dev *rdev)
{
if (rdev && rdev->supply)
return rdev->supply->rdev;
return NULL;
}
/**
* regulator_lock_supply - lock a regulator and its supplies
* @rdev: regulator source
@ -140,7 +148,7 @@ static void regulator_lock_supply(struct regulator_dev *rdev)
{
int i;
for (i = 0; rdev->supply; rdev = rdev->supply->rdev, i++)
for (i = 0; rdev; rdev = rdev_get_supply(rdev), i++)
mutex_lock_nested(&rdev->mutex, i);
}