]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 Feb 2019 15:30:40 +0000 (16:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 Feb 2019 15:30:40 +0000 (16:30 +0100)
added patches:
mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch

queue-4.9/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/queue-4.9/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch
new file mode 100644 (file)
index 0000000..6466bc4
--- /dev/null
@@ -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
+@@ -242,7 +242,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;
index 78bc441a4c989936c9e756fc89fdc03f83f5d3dc..37a75cd1b81ffc8fc4ae71a9960371a1b2fb75ee 100644 (file)
@@ -19,3 +19,4 @@ arm64-hibernate-clean-the-__hyp_text-to-poc-after-resume.patch
 gfs2-revert-fix-loop-in-gfs2_rbm_find.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