]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mmc: sdhci-cadence: fix uninitialized pointer deref on probe
authorPeng Fan <peng.fan@nxp.com>
Tue, 6 Aug 2019 02:48:02 +0000 (02:48 +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: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
drivers/mmc/sdhci-cadence.c

index 4f9338f7330f2f19cee0c096d55a26783e0fdd6d..4736263bf2a690c285bad5c33d32e133d31fb68d 100644 (file)
@@ -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);