aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-29 16:52:55 -0400
committerMark Brown <broonie@linaro.org>2013-07-31 04:56:40 -0400
commit462849aad50fced728d82a2ddba1b9d348e32f67 (patch)
tree7bb3590a9de97bd6417e31fc0ce1b59f3fc91d53 /drivers/mmc
parentbc35d5ed5d14e63a4d6018098a129196ba4c44ae (diff)
mmc: sdhci: Indicate that regulators may be absent
Use regulator_get_optional() to tell the core that requests for regulators can fail in a real system. Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a78bd4f3aecc..dd2c083c434d 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2966,7 +2966,7 @@ int sdhci_add_host(struct sdhci_host *host)
2966 mmc->caps |= MMC_CAP_NEEDS_POLL; 2966 mmc->caps |= MMC_CAP_NEEDS_POLL;
2967 2967
2968 /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ 2968 /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */
2969 host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); 2969 host->vqmmc = regulator_get_optional(mmc_dev(mmc), "vqmmc");
2970 if (IS_ERR_OR_NULL(host->vqmmc)) { 2970 if (IS_ERR_OR_NULL(host->vqmmc)) {
2971 if (PTR_ERR(host->vqmmc) < 0) { 2971 if (PTR_ERR(host->vqmmc) < 0) {
2972 pr_info("%s: no vqmmc regulator found\n", 2972 pr_info("%s: no vqmmc regulator found\n",
@@ -3042,7 +3042,7 @@ int sdhci_add_host(struct sdhci_host *host)
3042 3042
3043 ocr_avail = 0; 3043 ocr_avail = 0;
3044 3044
3045 host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); 3045 host->vmmc = regulator_get_optional(mmc_dev(mmc), "vmmc");
3046 if (IS_ERR_OR_NULL(host->vmmc)) { 3046 if (IS_ERR_OR_NULL(host->vmmc)) {
3047 if (PTR_ERR(host->vmmc) < 0) { 3047 if (PTR_ERR(host->vmmc) < 0) {
3048 pr_info("%s: no vmmc regulator found\n", 3048 pr_info("%s: no vmmc regulator found\n",