diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:17 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:17 -0400 |
| commit | f27a5fb424d4897edd3c7735ecf054ee57a5dbd0 (patch) | |
| tree | a6bc4d322341ee1211657302f41614b52572b207 /drivers/mmc/core/core.c | |
| parent | 6979380d85fd9e1ff701021206b315fcd66b510e (diff) | |
| parent | 9efdd27678ef5e22c27c230a08a211b702768f3a (diff) | |
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
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); |