lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 334/800] regulator: hi6421v600: Fix setting idle mode
    Date
    From: Axel Lin <axel.lin@ingics.com>

    [ Upstream commit 57c045bc727001c43b6a65adb0418aa7b3e6dbd0 ]

    commit db27f8294cd7 changed eco_mode << (ffs(sreg->eco_mode_mask) - 1)
    to sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1) which is wrong.
    Fix it by simply set val = sreg->eco_mode_mask.

    In additional, sreg->eco_mode_mask can be 0 (LDO3, LDO33, LDO34).
    Return -EINVAL if idle mode is not supported when sreg->eco_mode_mask is 0.

    While at it, also use unsigned int for reg_val/val which is the expected
    type for regmap_read and regmap_update_bits.

    Fixes: db27f8294cd7 ("staging: regulator: hi6421v600-regulator: use shorter names for OF properties")
    Signed-off-by: Axel Lin <axel.lin@ingics.com>
    Link: https://lore.kernel.org/r/20210619123423.4091429-1-axel.lin@ingics.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/regulator/hi6421v600-regulator.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/regulator/hi6421v600-regulator.c b/drivers/regulator/hi6421v600-regulator.c
    index d6340bb49296..d1e9406b2e3e 100644
    --- a/drivers/regulator/hi6421v600-regulator.c
    +++ b/drivers/regulator/hi6421v600-regulator.c
    @@ -129,7 +129,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
    {
    struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
    struct hi6421_spmi_pmic *pmic = sreg->pmic;
    - u32 reg_val;
    + unsigned int reg_val;

    regmap_read(pmic->regmap, rdev->desc->enable_reg, &reg_val);

    @@ -144,14 +144,17 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
    {
    struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
    struct hi6421_spmi_pmic *pmic = sreg->pmic;
    - u32 val;
    + unsigned int val;

    switch (mode) {
    case REGULATOR_MODE_NORMAL:
    val = 0;
    break;
    case REGULATOR_MODE_IDLE:
    - val = sreg->eco_mode_mask << (ffs(sreg->eco_mode_mask) - 1);
    + if (!sreg->eco_mode_mask)
    + return -EINVAL;
    +
    + val = sreg->eco_mode_mask;
    break;
    default:
    return -EINVAL;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:4.082 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site