未验证 提交 0b1e5526 编写于 作者: A Axel Lin 提交者: Mark Brown

regulator: da9121: Return REGULATOR_MODE_INVALID for invalid mode

-EINVAL is not a valid return value for .of_map_mode, return
REGULATOR_MODE_INVALID instead.

Fixes: 65ac9704 ("regulator: da9121: add mode support")
Signed-off-by: NAxel Lin <axel.lin@ingics.com>
Acked-by: NAdam Ward <Adam.Ward.opensource@diasemi.com>
Link: https://lore.kernel.org/r/20210517052721.1063375-1-axel.lin@ingics.comSigned-off-by: NMark Brown <broonie@kernel.org>
上级 adf1471b
...@@ -280,7 +280,7 @@ static unsigned int da9121_map_mode(unsigned int mode) ...@@ -280,7 +280,7 @@ static unsigned int da9121_map_mode(unsigned int mode)
case DA9121_BUCK_MODE_FORCE_PFM: case DA9121_BUCK_MODE_FORCE_PFM:
return REGULATOR_MODE_STANDBY; return REGULATOR_MODE_STANDBY;
default: default:
return -EINVAL; return REGULATOR_MODE_INVALID;
} }
} }
...@@ -317,7 +317,7 @@ static unsigned int da9121_buck_get_mode(struct regulator_dev *rdev) ...@@ -317,7 +317,7 @@ static unsigned int da9121_buck_get_mode(struct regulator_dev *rdev)
{ {
struct da9121 *chip = rdev_get_drvdata(rdev); struct da9121 *chip = rdev_get_drvdata(rdev);
int id = rdev_get_id(rdev); int id = rdev_get_id(rdev);
unsigned int val; unsigned int val, mode;
int ret = 0; int ret = 0;
ret = regmap_read(chip->regmap, da9121_mode_field[id].reg, &val); ret = regmap_read(chip->regmap, da9121_mode_field[id].reg, &val);
...@@ -326,7 +326,11 @@ static unsigned int da9121_buck_get_mode(struct regulator_dev *rdev) ...@@ -326,7 +326,11 @@ static unsigned int da9121_buck_get_mode(struct regulator_dev *rdev)
return -EINVAL; return -EINVAL;
} }
return da9121_map_mode(val & da9121_mode_field[id].msk); mode = da9121_map_mode(val & da9121_mode_field[id].msk);
if (mode == REGULATOR_MODE_INVALID)
return -EINVAL;
return mode;
} }
static const struct regulator_ops da9121_buck_ops = { static const struct regulator_ops da9121_buck_ops = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册