From: Timo Teras <timo.teras@solidboot.com>
Date: Thu, 2 Nov 2006 18:43:27 +0000 (+0100)
Subject: MMC: Do not set unsupported bits in OCR response
X-Git-Tag: v2.6.19-rc6~23^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=63ef731aa6a81e286de78dcc92241d123424ed39;p=linux-2.6-omap-h63xx.git

MMC: Do not set unsupported bits in OCR response

The card might go to inactive state (according to specification), if
there are unsupported bits set in the OCR.

Signed-off-by: Timo Teras <timo.teras@solidboot.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
---

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ec8168ac75b..766bc54406e 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -475,7 +475,7 @@ static u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
 	if (bit) {
 		bit -= 1;
 
-		ocr = 3 << bit;
+		ocr &= 3 << bit;
 
 		host->ios.vdd = bit;
 		mmc_set_ios(host);