From: NeilBrown <neilb@suse.de>
To: Chris Ball <cjb@laptop.org>, Venkatraman S <svenkatr@ti.com>,
Balaji T K <balajitk@ti.com>, Rajendra Nayak <rnayak@ti.com>
Cc: linux-omap@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] MMC/omap_hsmmc: handle failure of regulator_get better.
Date: Mon, 30 Jul 2012 10:12:45 +1000 [thread overview]
Message-ID: <20120730101245.7dbe72b0@notabene.brown> (raw)
[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]
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>
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 389a3ee..f052c29 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -299,12 +299,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) {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next reply other threads:[~2012-07-30 0:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-30 0:12 NeilBrown [this message]
2012-07-30 5:20 ` [PATCH] MMC/omap_hsmmc: handle failure of regulator_get better Rajendra Nayak
2012-07-30 6:24 ` NeilBrown
2012-07-30 6:37 ` Rajendra Nayak
2012-07-30 6:48 ` NeilBrown
2012-08-08 4:07 ` Chris Ball
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120730101245.7dbe72b0@notabene.brown \
--to=neilb@suse.de \
--cc=balajitk@ti.com \
--cc=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rnayak@ti.com \
--cc=svenkatr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.