mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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>
This commit is contained in:
parent
bc35d5ed5d
commit
462849aad5
1 changed files with 2 additions and 2 deletions
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue