| From 39b3a1c4cf251a3fddef585d8a09946540eab127 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 23 Dec 2018 21:59:18 +0100 |
| Subject: mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe |
| |
| From: Stefan Wahren <stefan.wahren@i2se.com> |
| |
| [ Upstream commit 1e20186e706da8446f9435f2924cd65ab1397e73 ] |
| |
| We need to handle mmc_of_parse() errors during probe otherwise the |
| MMC driver could start without proper initialization (e.g. power sequence). |
| |
| Fixes: 476bf3d62d5c ("mmc: sdhci-brcmstb: Add driver for Broadcom BRCMSTB SoCs") |
| Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mmc/host/sdhci-brcmstb.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c |
| index 159f6f64c68e7..ed6473731b458 100644 |
| --- a/drivers/mmc/host/sdhci-brcmstb.c |
| +++ b/drivers/mmc/host/sdhci-brcmstb.c |
| @@ -90,7 +90,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) |
| host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ; |
| |
| sdhci_get_of_property(pdev); |
| - mmc_of_parse(host->mmc); |
| + res = mmc_of_parse(host->mmc); |
| + if (res) |
| + goto err; |
| |
| /* |
| * Supply the existing CAPS, but clear the UHS modes. This |
| -- |
| 2.20.1 |
| |
