diff options
| author | Peng Fan <peng.fan@nxp.com> | 2019-08-06 02:47:53 +0000 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2019-08-09 13:45:25 +0800 |
| commit | 6904e1b2504a6f4c64589c04b5b88144eed2e61b (patch) | |
| tree | 7a7a3391f396725dbc372777ee5edfcdb12a3804 /drivers/mmc | |
| parent | 425d83346d7b2e6946633a7b96e6116f68b6e21f (diff) | |
| download | u-boot-6904e1b2504a6f4c64589c04b5b88144eed2e61b.zip u-boot-6904e1b2504a6f4c64589c04b5b88144eed2e61b.tar.gz u-boot-6904e1b2504a6f4c64589c04b5b88144eed2e61b.tar.bz2 | |
mmc: msm_sdhci: 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 <faiz_abbas@ti.com>
Cc: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/msm_sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 51f9e0e..cae42ec 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -141,12 +141,12 @@ static int msm_sdc_probe(struct udevice *dev) writel(caps, host->ioaddr + SDHCI_VENDOR_SPEC_CAPABILITIES0); } - ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); host->mmc = &plat->mmc; + host->mmc->dev = dev; + ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); if (ret) return ret; host->mmc->priv = &prv->host; - host->mmc->dev = dev; upriv->mmc = host->mmc; return sdhci_probe(dev); |