linux-kernel - [PATCH] mmc: In mmc_power_up, use previously selected ocr if available

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 9 Feb 2009 18:58:08 +0530
From:	Balaji Rao <balajirrao@...nmoko.org>
To:	LKML <linux-kernel@...r.kernel.org>
Cc:	Andy Green <andy@...nmoko.com>,
	Pierre Ossman <drzeus-mmc@...eus.cx>
Subject: [PATCH] mmc: In mmc_power_up, use previously selected ocr if
	available

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@...nmoko.org>
Cc: Andy Green <andy@...nmoko.com>
Cc: Pierre Ossman <drzeus-mmc@...eus.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/