Skip to content

Commit

Permalink
mmc: host: omap_hsmmc: use devm_regulator_get_optional() for vmmc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kishon authored and storulf committed Aug 27, 2015
1 parent 5f2b3ea commit 7d607f9
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/mmc/host/omap_hsmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,19 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
{
struct regulator *reg;
int ocr_value = 0;
int ret;

if (mmc_pdata(host)->set_power)
return 0;

reg = devm_regulator_get(host->dev, "vmmc");
reg = devm_regulator_get_optional(host->dev, "vmmc");
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));
return PTR_ERR(reg);
} else {
host->vcc = reg;
ocr_value = mmc_regulator_get_ocrmask(reg);
Expand Down

0 comments on commit 7d607f9

Please sign in to comment.