]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
mmc: msm_sdhci: Set mmc->dev pointer in msm_sdc_probe()
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Sun, 26 Jun 2016 20:43:55 +0000 (22:43 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 8 Jul 2016 13:57:30 +0000 (09:57 -0400)
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 <mateusz.kulikowski@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
drivers/mmc/msm_sdhci.c

index 64bbf0cd2507fe57062017031c6419d4a756bec0..96dcdbec5196106cfebf93878436c4fda06a2bd6 100644 (file)
@@ -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)