lkml.org 
[lkml]   [2012]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [stable-resend] regulator: core: if voltage scaling fails, restore original voltage values
    Date
    Cc: stable@vger.kernel.org
    Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
    Tested-by: Robert Nelson <robertcnelson@gmail.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    ---
    drivers/regulator/core.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
    index e872c8b..c347fd0 100644
    --- a/drivers/regulator/core.c
    +++ b/drivers/regulator/core.c
    @@ -2250,6 +2250,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
    {
    struct regulator_dev *rdev = regulator->rdev;
    int ret = 0;
    + int old_min_uV, old_max_uV;

    mutex_lock(&rdev->mutex);

    @@ -2271,18 +2272,29 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
    ret = regulator_check_voltage(rdev, &min_uV, &max_uV);
    if (ret < 0)
    goto out;
    +
    + /* restore original values in case of error */
    + old_min_uV = regulator->min_uV;
    + old_max_uV = regulator->max_uV;
    regulator->min_uV = min_uV;
    regulator->max_uV = max_uV;

    ret = regulator_check_consumers(rdev, &min_uV, &max_uV);
    if (ret < 0)
    - goto out;
    + goto out2;

    ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
    -
    + if (ret < 0)
    + goto out2;
    +
    out:
    mutex_unlock(&rdev->mutex);
    return ret;
    +out2:
    + regulator->min_uV = old_min_uV;
    + regulator->max_uV = old_max_uV;
    + mutex_unlock(&rdev->mutex);
    + return ret;
    }
    EXPORT_SYMBOL_GPL(regulator_set_voltage);

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-12-18 01:01    [W:4.499 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site