From 6f16cbe55be732e65e72544ff72d68acf266e359 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 6 Aug 2019 02:47:59 +0000 Subject: [PATCH] mmc: s5p: 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: Jaehoon Chung Signed-off-by: Peng Fan --- drivers/mmc/s5p_sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 9dd0b86..53efa96 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -204,13 +204,13 @@ static int s5p_sdhci_probe(struct udevice *dev) if (ret) return ret; + host->mmc = &plat->mmc; + host->mmc->dev = dev; ret = sdhci_setup_cfg(&plat->cfg, host, 0, 400000); if (ret) return ret; - host->mmc = &plat->mmc; host->mmc->priv = host; - host->mmc->dev = dev; upriv->mmc = host->mmc; return sdhci_probe(dev); -- 2.7.4