mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-12-08 23:03:46 +00:00
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 6b6d85cc36b148e26cf03f5a8ca412e694d11456 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||
|
|
Date: Sun, 23 Dec 2018 21:59:17 +0100
|
||
|
|
Subject: [PATCH 5/5] mmc: sdhci-iproc: handle mmc_of_parse() errors during
|
||
|
|
probe
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
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 0db99057c44f..9d12c06c7fd6 100644
|
||
|
|
--- a/drivers/mmc/host/sdhci-iproc.c
|
||
|
|
+++ b/drivers/mmc/host/sdhci-iproc.c
|
||
|
|
@@ -296,7 +296,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_property(pdev);
|
||
|
|
|
||
|
|
host->mmc->caps |= iproc_host->data->mmc_caps;
|
||
|
|
--
|
||
|
|
2.19.2
|
||
|
|
|