Commit 50a874a4 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman

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

commit 2bd44dad 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: b580c52d ("mmc: sdhci-iproc: add IPROC SDHCI driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a32f086
...@@ -279,7 +279,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) ...@@ -279,7 +279,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
iproc_host->data = iproc_data; 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); sdhci_get_of_property(pdev);
host->mmc->caps |= iproc_host->data->mmc_caps; host->mmc->caps |= iproc_host->data->mmc_caps;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment