]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mmc: s5p: fix uninitialized pointer deref on probe
authorPeng Fan <peng.fan@nxp.com>
Tue, 6 Aug 2019 02:47:59 +0000 (02:47 +0000)
committerPeng Fan <peng.fan@nxp.com>
Fri, 9 Aug 2019 05:45:25 +0000 (13:45 +0800)
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 <faiz_abbas@ti.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
drivers/mmc/s5p_sdhci.c

index 9dd0b865eb867643fe0630bbe4363f1705679d10..53efa968cf507bff43dd2919a24102eedb6dbeee 100644 (file)
@@ -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);