Merge remote-tracking branch 'regulator/fix/bypass' into regulator-linus

e9cb77d0 · Mark Brown · 099cba20 · dd1a571d · e9cb77d0
Commit e9cb77d0 authored May 13, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/helpers.c drivers/regulator/helpers.c +1 -1

No files found.
--- 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;
 }