Commit 9369c97c authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Ulf Hansson

mmc: mmci: Cascade EPROBE_DEFER from regulators.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent dc524882
...@@ -1613,7 +1613,10 @@ static int mmci_probe(struct amba_device *dev, ...@@ -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); dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max);
/* Get regulators and the supported OCR mask */ /* 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) if (!mmc->ocr_avail)
mmc->ocr_avail = plat->ocr_mask; mmc->ocr_avail = plat->ocr_mask;
else if (plat->ocr_mask) else if (plat->ocr_mask)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment