Merge tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / mmc / host / sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b4d7f27..7a7fb4f 100644 (file)
--- 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",