From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 2 Feb 2019 15:30:57 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.20.7~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1188d18cc1f7a22f0ef714c51deda5a68e9f34a9;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch
---

diff --git a/queue-4.14/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/queue-4.14/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch
new file mode 100644
index 00000000000..561c9724462
--- /dev/null
+++ b/queue-4.14/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch
@@ -0,0 +1,41 @@
+From 2bd44dadd5bfb4135162322fd0b45a174d4ad5bf Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Sun, 23 Dec 2018 21:59:17 +0100
+Subject: mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
+
+From: Stefan Wahren <stefan.wahren@i2se.com>
+
+commit 2bd44dadd5bfb4135162322fd0b45a174d4ad5bf upstream.
+
+We need to handle mmc_of_parse() errors during probe.
+
+This finally fixes the wifi regression on Raspberry Pi 3 series.
+In error case the wifi chip was permanently in reset because of
+the power sequence depending on the deferred probe of the GPIO expander.
+
+Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver")
+Cc: stable@vger.kernel.org
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/mmc/host/sdhci-iproc.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/sdhci-iproc.c
++++ b/drivers/mmc/host/sdhci-iproc.c
+@@ -278,7 +278,10 @@ static int sdhci_iproc_probe(struct plat
+ 
+ 	iproc_host->data = iproc_data;
+ 
+-	mmc_of_parse(host->mmc);
++	ret = mmc_of_parse(host->mmc);
++	if (ret)
++		goto err;
++
+ 	sdhci_get_of_property(pdev);
+ 
+ 	host->mmc->caps |= iproc_host->data->mmc_caps;
diff --git a/queue-4.14/series b/queue-4.14/series
index 67ac6a0bd69..8f684f60ad9 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -34,3 +34,4 @@ alsa-hda-realtek-fixed-hp_pin-no-value.patch
 ib-hfi1-remove-overly-conservative-vm_exec-flag-check.patch
 platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch
 platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch
+mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch