[PATCH] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe

[PATCH] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe

[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.

A manual backport of the original patch was needed because
sdhci_get_of_property() was replaced by sdhci_get_property() upstream.

Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver")
Cc: stable@vger.kernel.org # 4.14 and 4.19
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>
---
 drivers/mmc/host/sdhci-iproc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index d0e83db..94eeed2 100644
--- a/drivers/mmc/host/sdhci-iproc.c
+++ b/drivers/mmc/host/sdhci-iproc.c
@@ -279,7 +279,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
 
 	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;
-- 
2.7.4

Re: [PATCH] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe

[Greg KH]

On Sat, Feb 02, 2019 at 02:36:11PM +0100, Stefan Wahren wrote:
> 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.
> 
> A manual backport of the original patch was needed because
> sdhci_get_of_property() was replaced by sdhci_get_property() upstream.
> 
> Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver")
> Cc: stable@vger.kernel.org # 4.14 and 4.19

Thanks for this, I've also queued it up for 4.4.y and 4.9.y as
b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") is present in
those releases.

greg k-h