diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-08 00:06:00 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-09-04 13:58:16 -0400 |
| commit | 1fdc90fb8fb752d4d8d2602115cf4bd071374068 (patch) | |
| tree | 77eff86eab3a1b35e4b1e48cb74b43b0dea8b1c2 /drivers/mmc/host/omap_hsmmc.c | |
| parent | 5fdb4505f65227c127092772ccf9d460d69f4bc2 (diff) | |
mmc: omap_hsmmc: Handle failure of regulator_get better.
1/ If regulator_get fails, return an error. This is important if
it failed with EPROBE_DEFER, as the probe needs to be deferred.
2/ Don't set .set_power until the regulator has been found, or
the deferred probe will not bother calling omap_hsmmc_reg_get().
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 3a09f93cc3b6..e1807350d3ed 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -301,12 +301,12 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) struct regulator *reg; int ocr_value = 0; - mmc_slot(host).set_power = omap_hsmmc_set_power; - reg = regulator_get(host->dev, "vmmc"); if (IS_ERR(reg)) { dev_dbg(host->dev, "vmmc regulator missing\n"); + return PTR_ERR(reg); } else { + mmc_slot(host).set_power = omap_hsmmc_set_power; host->vcc = reg; ocr_value = mmc_regulator_get_ocrmask(reg); if (!mmc_slot(host).ocr_mask) { |