Patch "regulator: core: Correct return value check in regulator_resolve_supply" has been added to the 4.2-stable tree

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

regulator: core: Correct return value check in regulator_resolve_supply

to the 4.2-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:
regulator-core-correct-return-value-check-in-regulator_resolve_supply.patch
and it can be found in the queue-4.2 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, 17 Sep 2015 14:50:20 +0100
Subject: regulator: core: Correct return value check in regulator_resolve_supply

From: Charles Keepax <[email protected]>

commit 23c3f310e897837aeb8ffe8700b803cb58e7b35d upstream.

The ret pointer passed to regulator_dev_lookup is only filled with a valid error code if regulator_dev_lookup returned NULL. Currently regulator_resolve_supply checks this ret value before it checks if a regulator was returned, this can result in valid regulator lookups being ignored.

---
 drivers/regulator/core.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

@@ -1376,15 +1376,15 @@ static int regulator_resolve_supply(stru
 		return 0;
 
 	r = regulator_dev_lookup(dev, rdev->supply_name, &ret);
-	if (ret == -ENODEV) {
-		/*
-		 * No supply was specified for this regulator and
-		 * there will never be one.
-		 */
-		return 0;
-	}
-
 	if (!r) {
+		if (ret == -ENODEV) {
+			/*
+			 * No supply was specified for this regulator and
+			 * there will never be one.
+			 */
+			return 0;
+		}
+
 		if (have_full_constraints()) {
 			r = dummy_regulator_rdev;
 		} else {

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

queue-4.2/regulator-core-correct-return-value-check-in-regulator_resolve_supply.patch