From 674d0b3d4ae924918146c7e6799165af286b396c Mon Sep 17 00:00:00 2001
From: Timo Teras <timo.teras@solidboot.com>
Date: Thu, 2 Nov 2006 19:43:27 +0100
Subject: [PATCH] --- yaml --- r: 40899 b: refs/heads/master c:
 63ef731aa6a81e286de78dcc92241d123424ed39 h: refs/heads/master i:   40897:
 8dd3c32500ca5fb0d8e16ee9e2ea412d3e5300fa   40895:
 8a2e5c6757b803bd63d30d2d45277a21298e09fa v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/mmc/mmc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c05cdf9b0b7b..fed274066843 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25a122fd0d28b48782b9524a85895573e7ccf304
+refs/heads/master: 63ef731aa6a81e286de78dcc92241d123424ed39
diff --git a/trunk/drivers/mmc/mmc.c b/trunk/drivers/mmc/mmc.c
index ec8168ac75b1..766bc54406e5 100644
--- a/trunk/drivers/mmc/mmc.c
+++ b/trunk/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);