summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-12-09 10:57:43 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-12-09 10:57:43 +0100
commitf28eead6cea886e45fc5178d210df940a222f243 (patch)
treef4bdc84260e920522b0aa2246f698c3480cc3ce9
parent0483562c0abf2f65fb97a3e3979a9285641cd376 (diff)
downloadbarebox-f28eead6cea886e45fc5178d210df940a222f243.tar.gz
barebox-f28eead6cea886e45fc5178d210df940a222f243.tar.xz
Revert "mci: core: make mci_register -EPROBE_DEFER sensitive"
The patch does the right thing: When a regulator can't be found and -EPROBE_DEFER is returned we forward it. However, we have several boards in the tree which do not have any driver for the regulator, but still work because the regulator is enabled by default or by board code. Revert this patch until a solution for these board is found. This reverts commit 2e16c52ea277dd002235835a10f349233c31d965.
-rw-r--r--drivers/mci/mci-core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 9e39cbbb55..67257bcd18 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1819,10 +1819,6 @@ int mci_register(struct mci_host *host)
host->supply = regulator_get(host->hw_dev, "vmmc");
if (IS_ERR(host->supply)) {
- if (host->supply == ERR_PTR(-EPROBE_DEFER)) {
- ret = -EPROBE_DEFER;
- goto err_free;
- }
dev_err(&mci->dev, "Failed to get 'vmmc' regulator.\n");
host->supply = NULL;
}