nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mmc: host: omap_hsmmc: use devm_regulator_get_optional() for vmmc

Browse source 
Since vmmc can be optional for some platforms, use
devm_regulator_get_optional() for vmmc. Now return error only
if the return value of devm_regulator_get_optional() is not the
same as -ENODEV, since with -EPROBE_DEFER, the regulator can be
obtained later and all other errors are fatal.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kishon Vijay Abraham I 2015-08-27 14:43:53 +05:30 committed by Ulf Hansson
parent 5f2b3eab3f
commit 7d607f9170
1 changed files with 7 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mmc/host/omap_hsmmc.c
View file

@ -345,15 +345,19 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
{ {
struct regulator *reg; struct regulator *reg;
int ocr_value = 0; int ocr_value = 0;
int ret;
if (mmc_pdata(host)->set_power) if (mmc_pdata(host)->set_power)
return 0; return 0;
reg = devm_regulator_get(host->dev, "vmmc"); reg = devm_regulator_get_optional(host->dev, "vmmc");
if (IS_ERR(reg)) { if (IS_ERR(reg)) {
dev_err(host->dev, "unable to get vmmc regulator %ld\n", ret = PTR_ERR(reg);
if (ret != -ENODEV)
return ret;
host->vcc = NULL;
dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
PTR_ERR(reg)); PTR_ERR(reg));
return PTR_ERR(reg);
} else { } else {
host->vcc = reg; host->vcc = reg;
ocr_value = mmc_regulator_get_ocrmask(reg); ocr_value = mmc_regulator_get_ocrmask(reg);