summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 14:22:38 +0100
committerMark Brown <broonie@kernel.org>2016-05-13 14:22:38 +0100
commite9cb77d03ca1055d0d65483bc972a5a0e8d3eeed (patch)
tree4759b5d966702cd5a2809d4d37bf66253c898046 /drivers/regulator
parent099cba20b211dd0ca66b0991a32bb22dc64bdcb8 (diff)
parentdd1a571daee7cdd6504a5771721e34f9b118f17a (diff)
downloadlinux-e9cb77d03ca1055d0d65483bc972a5a0e8d3eeed.tar.bz2
Merge remote-tracking branch 'regulator/fix/bypass' into regulator-linus
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/helpers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c
index b1e32e7482e9..bcf38fd5106a 100644
--- a/drivers/regulator/helpers.c
+++ b/drivers/regulator/helpers.c
@@ -460,7 +460,7 @@ int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable)
if (ret != 0)
return ret;
- *enable = val & rdev->desc->bypass_mask;
+ *enable = (val & rdev->desc->bypass_mask) == rdev->desc->bypass_val_on;
return 0;
}