Skip to content

Commit

Permalink
regulator: core: Ensure we lock all regulators
Browse files Browse the repository at this point in the history
The latest workaround for the lockdep interface's not using the second
argument of mutex_lock_nested() changed the loop missed locking the last
regulator due to a thinko with the loop termination condition exiting
one regulator too soon.

Reported-by: Tyler Baker <tyler.baker@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Mark Brown committed Dec 2, 2015
1 parent bb41897 commit 49a6bb7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static void regulator_lock_supply(struct regulator_dev *rdev)
int i;

mutex_lock(&rdev->mutex);
for (i = 1; rdev->supply; rdev = rdev->supply->rdev, i++)
for (i = 1; rdev; rdev = rdev->supply->rdev, i++)
mutex_lock_nested(&rdev->mutex, i);
}

Expand Down

0 comments on commit 49a6bb7

Please sign in to comment.