diff options
| author | Mark Brown | 2013-07-29 22:52:55 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-07-31 10:56:40 +0200 |
| commit | 462849aad50fced728d82a2ddba1b9d348e32f67 (patch) | |
| tree | 7bb3590a9de97bd6417e31fc0ce1b59f3fc91d53 /drivers/mmc/host/sdhci.c | |
| parent | mmc: core: Indicate that vmmcq may be absent (diff) | |
| download | kernel-qcow2-linux-462849aad50fced728d82a2ddba1b9d348e32f67.tar.gz kernel-qcow2-linux-462849aad50fced728d82a2ddba1b9d348e32f67.tar.xz kernel-qcow2-linux-462849aad50fced728d82a2ddba1b9d348e32f67.zip | |
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/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
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) mmc->caps |= MMC_CAP_NEEDS_POLL; /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ - host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); + host->vqmmc = regulator_get_optional(mmc_dev(mmc), "vqmmc"); if (IS_ERR_OR_NULL(host->vqmmc)) { if (PTR_ERR(host->vqmmc) < 0) { pr_info("%s: no vqmmc regulator found\n", @@ -3042,7 +3042,7 @@ int sdhci_add_host(struct sdhci_host *host) ocr_avail = 0; - host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); + host->vmmc = regulator_get_optional(mmc_dev(mmc), "vmmc"); if (IS_ERR_OR_NULL(host->vmmc)) { if (PTR_ERR(host->vmmc) < 0) { pr_info("%s: no vmmc regulator found\n", |