UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 65ac97042d ("regulator: da9121: add mode support")
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Adam Ward <Adam.Ward.opensource@diasemi.com>
Link: https://lore.kernel.org/r/20210517052721.1063375-1-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2021-05-17 13:27:21 +08:00 committed by Mark Brown
parent adf1471b2f
commit 0b1e552673
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/regulator/da9121-regulator.c
View File

@ -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)
{ {
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)
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 = {