lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 112/163] Revert "regulator: core: Fix nested locking of supplies"
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    This reverts commit b1999fa6e8145305a6c8bda30ea20783717708e6 which was
    commit 70a7fb80e85ae7f78f8e90cec3fbd862ea6a4d4b upstream.

    It causes run-time breakage in the 4.4-stable tree and more patches are
    needed to be applied first before this one in order to resolve the
    issue.

    Reported-by: Guenter Roeck <linux@roeck-us.net>
    Cc: Mark Brown <broonie@kernel.org>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Thierry Reding <treding@nvidia.com>
    Cc: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/regulator/core.c | 10 +---------
    1 file changed, 1 insertion(+), 9 deletions(-)

    --- a/drivers/regulator/core.c
    +++ b/drivers/regulator/core.c
    @@ -132,14 +132,6 @@ 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
    @@ -148,7 +140,7 @@ static void regulator_lock_supply(struct
    {
    int i;

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


    \
     
     \ /
      Last update: 2016-05-03 04:01    [W:4.035 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site