Patch "regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
regulators-helpers-fix-handling-of-bypass_val_on-in-get_bypass_regmap.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Charles Keepax <[email protected]>
Date: Thu, 10 Nov 2016 10:45:18 +0000
Subject: regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap

From: Charles Keepax <[email protected]>

commit 85b037442e3f0e84296ab1010fd6b057eee18496 upstream.

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.

---
 drivers/regulator/helpers.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

@@ -454,13 +454,17 @@ EXPORT_SYMBOL_GPL(regulator_set_bypass_r
 int regulator_get_bypass_regmap(struct regulator_dev *rdev, bool *enable)
 {
 	unsigned int val;
+	unsigned int val_on = rdev->desc->bypass_val_on;
 	int ret;
 
 	ret = regmap_read(rdev->regmap, rdev->desc->bypass_reg, &val);
 	if (ret != 0)
 		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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/regulators-helpers-fix-handling-of-bypass_val_on-in-get_bypass_regmap.patch