Patch "regulator: core: Handle probe deferral from DT when resolving supplies" has been added to the 4.2-stable tree

[<gregkh@linuxfoundation.org>]

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

    regulator: core: Handle probe deferral from DT when resolving supplies

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-handle-probe-deferral-from-dt-when-resolving-supplies.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 <stable@vger.kernel.org> know about it.


>From 06423121d9eba0a56b9341cf82b88479017bce14 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@kernel.org>
Date: Thu, 1 Oct 2015 10:59:48 +0100
Subject: regulator: core: Handle probe deferral from DT when resolving supplies

From: Mark Brown <broonie@kernel.org>

commit 06423121d9eba0a56b9341cf82b88479017bce14 upstream.

When resolving regulator-regulator supplies we ignore probe deferral
returns from regulator_dev_lookup() (such as are generated for DT when
we can see a supply is registered) and just fall back to the dummy
regulator if there are full constraints (as is the case for DT).  This
means that probe deferral is broken for DT systems, fix that by paying
attention to -EPROBE_DEFER return codes like we do -ENODEV.

A further patch will simplify this further, this is a minimal fix for
the specific issue.

Fixes: 9f7e25edb1575a6d2 (regulator: core: Handle full constraints systems when resolving supplies)
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Mark Brown <broonnie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1385,6 +1385,10 @@ static int regulator_resolve_supply(stru
 			return 0;
 		}
 
+		/* Did the lookup explicitly defer for us? */
+		if (ret == -EPROBE_DEFER)
+			return ret;
+
 		if (have_full_constraints()) {
 			r = dummy_regulator_rdev;
 		} else {


Patches currently in stable-queue which might be from broonie@kernel.org are

queue-4.2/asoc-pxa-pxa2xx-ac97-fix-dma-requestor-lines.patch
queue-4.2/spi-xtensa-xtfpga-fix-register-endianness.patch
queue-4.2/spi-bcm2835-bug-fix-wrong-use-of-page_mask.patch
queue-4.2/spi-fix-documentation-of-spi_alloc_master.patch
queue-4.2/regulator-core-correct-return-value-check-in-regulator_resolve_supply.patch
queue-4.2/asoc-fix-broken-pxa-soc-support.patch
queue-4.2/asoc-sgtl5000-fix-wrong-register-mic_bias_voltage-setup-on-probe.patch
queue-4.2/asoc-dwc-correct-irq-clear-method.patch
queue-4.2/asoc-db1200-fix-dai-link-format-for-db1300-and-db1550.patch
queue-4.2/regulator-axp20x-fix-enable-bit-indexes-for-dcdc4-and-dcdc5.patch
queue-4.2/regulator-core-handle-probe-deferral-from-dt-when-resolving-supplies.patch
queue-4.2/spi-spidev-fix-possible-null-dereference.patch
queue-4.2/asoc-tas2552-fix-dbscale-min-declaration.patch
queue-4.2/spi-spi-pxa2xx-check-status-register-to-determine-if-sssr_tint-is-disabled.patch