projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc52488
)
mmc: mmci: Cascade EPROBE_DEFER from regulators.
author
Bjorn Andersson
<bjorn.andersson@sonymobile.com>
Wed, 25 Mar 2015 01:39:49 +0000
(18:39 -0700)
committer
Ulf Hansson
<ulf.hansson@linaro.org>
Wed, 25 Mar 2015 08:46:35 +0000
(09:46 +0100)
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mmci.c
patch
|
blob
|
history
diff --git
a/drivers/mmc/host/mmci.c
b/drivers/mmc/host/mmci.c
index
7fe1619
..
fb26674
100644
(file)
--- 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)