]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mmc: sdhci: Indicate that regulators may be absent
authorMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 20:52:55 +0000 (21:52 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 31 Jul 2013 08:56:40 +0000 (09:56 +0100)
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>
drivers/mmc/host/sdhci.c

index a78bd4f3aeccba6615fb71bbdcde4d283b89ba29..dd2c083c434da3f075c6b3566085f2555683315e 100644 (file)
@@ -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",