diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-29 16:58:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-31 04:56:39 -0400 |
commit | bc35d5ed5d14e63a4d6018098a129196ba4c44ae (patch) | |
tree | df179e2bf45688bc95b77ecdb7b3abd18503a030 /drivers/mmc/core/core.c | |
parent | de1dd9fd2156874b45803299b3b27e65d5defdd9 (diff) |
mmc: core: Indicate that vmmcq may be absent
Use regulator_get_optional() to tell the core that requests for the vmmcq
regulator 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/core/core.c')
-rw-r--r-- | drivers/mmc/core/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 49a5bca418bd..5d088551196b 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
@@ -1313,7 +1313,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) | |||
1313 | 1313 | ||
1314 | supply = devm_regulator_get(dev, "vmmc"); | 1314 | supply = devm_regulator_get(dev, "vmmc"); |
1315 | mmc->supply.vmmc = supply; | 1315 | mmc->supply.vmmc = supply; |
1316 | mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc"); | 1316 | mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc"); |
1317 | 1317 | ||
1318 | if (IS_ERR(supply)) | 1318 | if (IS_ERR(supply)) |
1319 | return PTR_ERR(supply); | 1319 | return PTR_ERR(supply); |