diff options
author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2015-03-24 21:39:49 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-03-25 04:46:35 -0400 |
commit | 9369c97cc7eca4a73baf382cfabe92ed20ea04ed (patch) | |
tree | 2b00ca11ca2b00bfeb05e2b21716f925a8b820fb /drivers/mmc | |
parent | dc5248820d0b766155fb542e060131a979594b56 (diff) |
mmc: mmci: Cascade EPROBE_DEFER from regulators.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/mmci.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, | |||
1613 | dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); | 1613 | dev_dbg(mmc_dev(mmc), "clocking block at %u Hz\n", mmc->f_max); |
1614 | 1614 | ||
1615 | /* Get regulators and the supported OCR mask */ | 1615 | /* Get regulators and the supported OCR mask */ |
1616 | mmc_regulator_get_supply(mmc); | 1616 | ret = mmc_regulator_get_supply(mmc); |
1617 | if (ret == -EPROBE_DEFER) | ||
1618 | goto clk_disable; | ||
1619 | |||
1617 | if (!mmc->ocr_avail) | 1620 | if (!mmc->ocr_avail) |
1618 | mmc->ocr_avail = plat->ocr_mask; | 1621 | mmc->ocr_avail = plat->ocr_mask; |
1619 | else if (plat->ocr_mask) | 1622 | else if (plat->ocr_mask) |