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

regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap 

The handling of bypass_val_on that was added in
regulator_get_bypass_regmap is done unconditionally however
several drivers don't define a value for bypass_val_on. This
results in those drivers reporting bypass being enabled when
it is not. In regulator_set_bypass_regmap we use bypass_mask
if bypass_val_on is zero. This patch adds similar handling in
regulator_get_bypass_regmap.

Fixes: commit dd1a571dae ("regulator: helpers: Ensure bypass register field matches ON value")
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2016-11-10 10:45:18 +00:00 committed by Mark Brown
parent 1001354ca3
commit 85b037442e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/helpers.c
View File

@ -454,13 +454,17 @@ EXPORT_SYMBOL_GPL(regulator_set_bypass_regmap);
int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable) int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable)
{ {
unsigned int val; unsigned int val;
unsigned int val_on = rdev->desc->bypass_val_on;
int ret; int ret;
ret = regmap_read(rdev->regmap, rdev->desc->bypass_reg, &val); ret = regmap_read(rdev->regmap, rdev->desc->bypass_reg, &val);
if (ret != 0) if (ret != 0)
return ret; return ret;
*enable = (val & rdev->desc->bypass_mask) == rdev->desc->bypass_val_on; if (!val_on)
val_on = rdev->desc->bypass_mask;
*enable = (val & rdev->desc->bypass_mask) == val_on;
return 0; return 0;
} }