summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@solidboot.com>2006-11-02 19:43:27 +0100
committerPierre Ossman <drzeus@drzeus.cx>2006-11-09 07:23:54 +0100
commit63ef731aa6a81e286de78dcc92241d123424ed39 (patch)
tree5bc9e64c7169300d1e586cda7c403cd66524c534
parentMMC: Poll card status after rescanning cards (diff)
downloadlinux-63ef731aa6a81e286de78dcc92241d123424ed39.tar.xz
linux-63ef731aa6a81e286de78dcc92241d123424ed39.zip
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>
-rw-r--r--drivers/mmc/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ec8168ac75b1..766bc54406e5 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);