From 5286488997bb9e133db9a2bf921985dae4bec8c0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 Feb 2019 16:31:13 +0100 Subject: [PATCH] 4.19-stable patches added patches: mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch --- ...dle-mmc_of_parse-errors-during-probe.patch | 41 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-4.19/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch diff --git a/queue-4.19/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/queue-4.19/mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch new file mode 100644 index 00000000000..475c9359e4a --- /dev/null +++ b/queue-4.19/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 +Date: Sun, 23 Dec 2018 21:59:17 +0100 +Subject: mmc: sdhci-iproc: handle mmc_of_parse() errors during probe + +From: Stefan Wahren + +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 +Acked-by: Adrian Hunter +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + + +--- + 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 +@@ -279,7 +279,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.19/series b/queue-4.19/series index c87bdc18009..e1b0686d508 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -55,3 +55,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 -- 2.47.2