diff options
| author | Peng Fan <peng.fan@nxp.com> | 2019-08-06 02:47:56 +0000 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2019-08-09 13:45:25 +0800 |
| commit | a5abe152b23ef9a07ffd14c3db655c6481a7f84f (patch) | |
| tree | 1e1673d276c0aaaec219b45c6c1ed2cb87facf58 | |
| parent | 6904e1b2504a6f4c64589c04b5b88144eed2e61b (diff) | |
| download | u-boot-a5abe152b23ef9a07ffd14c3db655c6481a7f84f.tar.gz u-boot-a5abe152b23ef9a07ffd14c3db655c6481a7f84f.tar.bz2 u-boot-a5abe152b23ef9a07ffd14c3db655c6481a7f84f.zip | |
mmc: pci: 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: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | drivers/mmc/pci_mmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 182d41637f..404264a697 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -33,12 +33,12 @@ static int pci_mmc_probe(struct udevice *dev) host->ioaddr = (void *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, PCI_REGION_MEM); host->name = dev->name; + host->mmc = &plat->mmc; + host->mmc->dev = dev; ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); if (ret) return ret; - host->mmc = &plat->mmc; host->mmc->priv = &priv->host; - host->mmc->dev = dev; upriv->mmc = host->mmc; return sdhci_probe(dev); |