From: Bjorn Andersson Date: Wed, 25 Mar 2015 01:39:49 +0000 (-0700) Subject: mmc: mmci: Cascade EPROBE_DEFER from regulators. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9369c97cc7eca4a73baf382cfabe92ed20ea04ed;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mmc: mmci: Cascade EPROBE_DEFER from regulators. Signed-off-by: Bjorn Andersson Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 7fe16194ebc8..fb266745f824 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1613,7 +1613,10 @@ static int mmci_probe(struct amba_device *dev, dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); /* Get regulators and the supported OCR mask */ - mmc_regulator_get_supply(mmc); + ret = mmc_regulator_get_supply(mmc); + if (ret == -EPROBE_DEFER) + goto clk_disable; + if (!mmc->ocr_avail) mmc->ocr_avail = plat->ocr_mask; else if (plat->ocr_mask)