Commit 500f3564 authored Sep 22, 2009 by Balaji Rao Committed by Linus Torvalds Sep 23, 2009

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@openmoko.org>
Cc: Andy Green <andy@openmoko.com>
Cc: Pierre Ossman <drzeus-mmc@drzeus.cx>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Philip Langdale <philipl@overt.org>
Acked-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e56770fb

drivers/mmc/core/core.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -687,7 +687,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)) {

Admin message