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

[pandora-kernel.git] / drivers / mmc / core / core.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index b9b9fb6..bf18b6b 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1357,7 +1357,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
 
        supply = devm_regulator_get(dev, "vmmc");
        mmc->supply.vmmc = supply;
-       mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
+       mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");
 
        if (IS_ERR(supply))
                return PTR_ERR(supply);