diff options
| author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2015-03-24 18:39:49 -0700 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-03-25 09:46:35 +0100 |
| commit | 9369c97cc7eca4a73baf382cfabe92ed20ea04ed (patch) | |
| tree | 2b00ca11ca2b00bfeb05e2b21716f925a8b820fb | |
| parent | dc5248820d0b766155fb542e060131a979594b56 (diff) | |
| download | linux-9369c97cc7eca4a73baf382cfabe92ed20ea04ed.tar.gz linux-9369c97cc7eca4a73baf382cfabe92ed20ea04ed.tar.bz2 linux-9369c97cc7eca4a73baf382cfabe92ed20ea04ed.zip | |
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>
| -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, 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) |