From d703104507a30c2b4197b2522e084ee01782d0dc Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 6 Aug 2019 02:48:02 +0000 Subject: [PATCH] mmc: sdhci-cadence: fix uninitialized pointer deref on probe Commit 3d296365e4e8 ("mmc: sdhci: Add support for sdhci-caps-mask") sdhci_setup_cfg() expects a valid sdhci_host mmc field. Fixes: 3d296365e4e8 ("mmc: sdhci: Add support for sdhci-caps-mask") Cc: Faiz Abbas Cc: Masahiro Yamada Signed-off-by: Peng Fan Acked-by: Masahiro Yamada --- drivers/mmc/sdhci-cadence.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index 4f9338f733..4736263bf2 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -269,12 +269,13 @@ static int sdhci_cdns_probe(struct udevice *dev) if (ret) return ret; + host->mmc = &plat->mmc; + host->mmc->dev = dev; ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); if (ret) return ret; upriv->mmc = &plat->mmc; - host->mmc = &plat->mmc; host->mmc->priv = host; return sdhci_probe(dev); -- 2.25.1