lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 234/639] mmc: sdhci-brcmstb: handle mmc_of_parse() errors during probe
    Date
    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 552bddc5096ce..1cd10356fc14f 100644
    --- a/drivers/mmc/host/sdhci-brcmstb.c
    +++ b/drivers/mmc/host/sdhci-brcmstb.c
    @@ -55,7 +55,9 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
    }

    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


    \
     
     \ /
      Last update: 2020-01-24 12:13    [W:2.050 / U:3.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site