| Message ID | 20190806030314.16520-6-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | d703104507a30c2b4197b2522e084ee01782d0dc |
| Delegated to: | Peng Fan |
| Headers | show |
| Series | [U-Boot,1/7] mmc: atmel_sdhci: fix uninitialized pointer deref on probe | expand |
On Tue, Aug 6, 2019 at 11:50 AM Peng Fan <peng.fan@nxp.com> wrote: > > 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: Masahiro Yamada <yamada.masahiro@socionext.com> > Signed-off-by: Peng Fan <peng.fan@nxp.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index 4f9338f733..4736263bf2 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -269,12 +269,13 @@ static int sdhci_cdns_probe(struct udevice *dev) if (ret) return ret; + host->mmc = &plat->mmc; + host->mmc->dev = dev; ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); if (ret) return ret; upriv->mmc = &plat->mmc; - host->mmc = &plat->mmc; host->mmc->priv = host; return sdhci_probe(dev);
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: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/mmc/sdhci-cadence.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)