diff options
| author | Peng Fan <peng.fan@nxp.com> | 2019-08-06 02:47:59 +0000 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2019-08-09 13:45:25 +0800 |
| commit | 6f16cbe55be732e65e72544ff72d68acf266e359 (patch) | |
| tree | ca8975831ceadbeb7ee581c29ecf41755470554a /drivers/mmc | |
| parent | a5abe152b23ef9a07ffd14c3db655c6481a7f84f (diff) | |
| download | u-boot-6f16cbe55be732e65e72544ff72d68acf266e359.zip u-boot-6f16cbe55be732e65e72544ff72d68acf266e359.tar.gz u-boot-6f16cbe55be732e65e72544ff72d68acf266e359.tar.bz2 | |
mmc: s5p: 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: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/s5p_sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 9dd0b86..53efa96 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -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); |