--- zzzz-none-000/linux-2.6.19.2/drivers/mmc/mmc.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/mmc/mmc.c	2007-01-11 07:38:19.000000000 +0000
@@ -475,7 +475,7 @@
 	if (bit) {
 		bit -= 1;
 
-		ocr &= 3 << bit;
+		ocr = 3 << bit;
 
 		host->ios.vdd = bit;
 		mmc_set_ios(host);
@@ -1178,29 +1178,14 @@
 {
 	struct mmc_host *host = data;
 	struct list_head *l, *n;
-	unsigned char power_mode;
 
 	mmc_claim_host(host);
 
-	/*
-	 * Check for removed cards and newly inserted ones. We check for
-	 * removed cards first so we can intelligently re-select the VDD.
-	 */
-	power_mode = host->ios.power_mode;
-	if (power_mode == MMC_POWER_ON)
+	if (host->ios.power_mode == MMC_POWER_ON)
 		mmc_check_cards(host);
 
 	mmc_setup(host);
 
-	/*
-	 * Some broken cards process CMD1 even in stand-by state. There is
-	 * no reply, but an ILLEGAL_COMMAND error is cached and returned
-	 * after next command. We poll for card status here to clear any
-	 * possibly pending error.
-	 */
-	if (power_mode == MMC_POWER_ON)
-		mmc_check_cards(host);
-
 	if (!list_empty(&host->cards)) {
 		/*
 		 * (Re-)calculate the fastest clock rate which the