Skip to content

Commit

Permalink
mmc: host: omap_hsmmc: return on fatal errors from omap_hsmmc_reg_get
Browse files Browse the repository at this point in the history
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 <[email protected]>
Tested-by: Tony Lindgren <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]>
  • Loading branch information
kishon authored and storulf committed Aug 27, 2015
1 parent 7d607f9 commit 6a9b2ff
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions drivers/mmc/host/omap_hsmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,28 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)

/* Allow an aux regulator */
reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
host->vcc_aux = IS_ERR(reg) ? NULL : reg;
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
if (ret != -ENODEV)
return ret;
host->vcc_aux = NULL;
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
PTR_ERR(reg));
} else {
host->vcc_aux = reg;
}

reg = devm_regulator_get_optional(host->dev, "pbias");
host->pbias = IS_ERR(reg) ? NULL : reg;
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
if (ret != -ENODEV)
return ret;
host->pbias = NULL;
dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
PTR_ERR(reg));
} else {
host->pbias = reg;
}

/* For eMMC do not power off when not in sleep state */
if (mmc_pdata(host)->no_regulator_off_init)
Expand Down

0 comments on commit 6a9b2ff

Please sign in to comment.