From: Balaji Rao <balajirrao@openmoko.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andy Green <andy@openmoko.com>, Pierre Ossman <drzeus-mmc@drzeus.cx>
Subject: [PATCH] mmc: In mmc_power_up, use previously selected ocr if available
Date: Mon, 9 Feb 2009 18:58:08 +0530 [thread overview]
Message-ID: <20090209132806.GD3278@fedora.yogi> (raw)
When mmc_power_up is called during unsafe resume, host->ocr should be
used instead of host->ocr_avail.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
Cc: Andy Green <andy@openmoko.com>
Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
---
drivers/mmc/core/core.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index df6ce4a..3ad7f87 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -572,7 +572,13 @@ void mmc_set_timing(struct mmc_host *host, unsigned int timing)
*/
static void mmc_power_up(struct mmc_host *host)
{
- int bit = fls(host->ocr_avail) - 1;
+ int bit;
+
+ /* If ocr is set, we use it */
+ if (host->ocr)
+ bit = ffs(host->ocr) - 1;
+ else
+ bit = fls(host->ocr_avail) - 1;
host->ios.vdd = bit;
if (mmc_host_is_spi(host)) {
--
1.6.0.6
next reply other threads:[~2009-02-09 13:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-09 13:28 Balaji Rao [this message]
2009-02-17 21:29 ` [PATCH] mmc: In mmc_power_up, use previously selected ocr if available Andrew Morton
2009-02-18 2:57 ` Balaji Rao
2009-02-18 20:25 ` Pierre Ossman
2009-02-25 9:58 ` [PATCH] mmc: During unsafe resume, select the right volatge for the card Balaji Rao
2009-03-08 13:41 ` Pierre Ossman
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=20090209132806.GD3278@fedora.yogi \
--to=balajirrao@openmoko.org \
--cc=andy@openmoko.com \
--cc=drzeus-mmc@drzeus.cx \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox