diff options
| author | Peng Fan <[email protected]> | 2019-08-06 02:48:04 +0000 |
|---|---|---|
| committer | Peng Fan <[email protected]> | 2019-08-09 13:45:25 +0800 |
| commit | d569b4b0a4f34969f83ef8ec89b44f406553e72b (patch) | |
| tree | fc5378e0f8404dc524a49ca37359918584c92b37 /drivers | |
| parent | d703104507a30c2b4197b2522e084ee01782d0dc (diff) | |
mmc: tangier_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 <[email protected]>
Cc: Vincent Tinelli <[email protected]>
Signed-off-by: Peng Fan <[email protected]>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/tangier_sdhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c index 4c33356b9fc..0d6e5d62460 100644 --- a/drivers/mmc/tangier_sdhci.c +++ b/drivers/mmc/tangier_sdhci.c @@ -51,13 +51,14 @@ static int sdhci_tangier_probe(struct udevice *dev) /* MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195 */ host->voltages = MMC_VDD_165_195; + host->mmc = &plat->mmc; + host->mmc->dev = dev; ret = sdhci_setup_cfg(&plat->cfg, host, SDHCI_TANGIER_FMAX, SDHCI_TANGIER_FMIN); if (ret) return ret; upriv->mmc = &plat->mmc; - host->mmc = &plat->mmc; host->mmc->priv = host; return sdhci_probe(dev); |