regulator: core: Ensure we lock all regulators

commit 49a6bb7a1c0963f260e4b0dcc2c0e56ec65a28b2 upstream.

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>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index daffff83ced2a6177db324c82d38803c9a411da1..f71db02fcb7130091e86c455ee70567e187f5cac 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -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);
 }