From eb9d3ca3560d9348f2db83beb2f51a85806519dd Mon Sep 17 00:00:00 2001 From: Mateusz Kulikowski Date: Sun, 26 Jun 2016 22:43:55 +0200 Subject: mmc: msm_sdhci: Set mmc->dev pointer in msm_sdc_probe() MMC core expects (now) valid mmc->dev pointer. During conversion in commit cffe5d86 not every driver was updated. This patch fixes crash while accessing MMC on boards using Qualcomm SDHCI controller. Signed-off-by: Mateusz Kulikowski Acked-by: Simon Glass --- drivers/mmc/msm_sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 64bbf0cd25..96dcdbec51 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -136,7 +136,12 @@ static int msm_sdc_probe(struct udevice *dev) host->version = sdhci_readw(host, SDHCI_HOST_VERSION); /* automatically detect max and min speed */ - return add_sdhci(host, 0, 0); + ret = add_sdhci(host, 0, 0); + if (ret) + return ret; + host->mmc->dev = dev; + + return 0; } static int msm_sdc_remove(struct udevice *dev) -- cgit v1.2.1