From: NeilBrown Date: Wed, 8 Aug 2012 04:06:00 +0000 (-0400) Subject: mmc: omap_hsmmc: Handle failure of regulator_get better. X-Git-Tag: next-20120816~45^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d2ce21b62294e177ac54a565bd56b8a17d89ab2c;p=karo-tx-linux.git 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 Acked-by: Rajendra Nayak Signed-off-by: Chris Ball --- 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) {