dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: pci: fix uninitialized pointer deref on probe

Browse Source 
Commit 3d296365e4 ("mmc: sdhci: Add support for
sdhci-caps-mask") sdhci_setup_cfg() expects a valid sdhci_host mmc
field.

Fixes: 3d296365e4 ("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>
This commit is contained in:
Peng Fan
2019-08-06 02:47:56 +00:00
parent 6904e1b250
commit a5abe152b2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/pci_mmc.c
View File

@@ -33,12 +33,12 @@ static int pci_mmc_probe(struct udevice *dev)
host->ioaddr = (void *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, host->ioaddr = (void *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0,
PCI_REGION_MEM); PCI_REGION_MEM);
host->name = dev->name; host->name = dev->name;
host->mmc = &plat->mmc;
host->mmc->dev = dev;
ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
if (ret) if (ret)
return ret; return ret;
host->mmc = &plat->mmc;
host->mmc->priv = &priv->host; host->mmc->priv = &priv->host;
host->mmc->dev = dev;
upriv->mmc = host->mmc; upriv->mmc = host->mmc;
return sdhci_probe(dev); return sdhci_probe(dev);