From b8109488529fa3b08cf6ffbba828e57ba44df780 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 1 May 2007 16:34:16 +0200
Subject: [PATCH] --- yaml --- r: 53591 b: refs/heads/master c:
 46a6730e3ff9add5089ddd007f998b97fb4e8571 h: refs/heads/master i:   53589:
 c5dad3865cf9bcc1515fa00423730ce9cbd2db11   53587:
 b8482aae05c5997862d6e32d6ba5b0e7c851da33   53583:
 30197babf5685aa68a3fc9ebdedd727ddcb535c1 v: v3

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

diff --git a/[refs] b/[refs]
index 847b89188e07..3b47fec753f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3647afcec11f2fcfc6269e513ff97fec1374d1b8
+refs/heads/master: 46a6730e3ff9add5089ddd007f998b97fb4e8571
diff --git a/trunk/drivers/mmc/host/omap.c b/trunk/drivers/mmc/host/omap.c
index 1b232c6dd016..fc044a5ed64e 100644
--- a/trunk/drivers/mmc/host/omap.c
+++ b/trunk/drivers/mmc/host/omap.c
@@ -969,8 +969,10 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		mmc_omap_power(host, 0);
 		break;
 	case MMC_POWER_UP:
-	case MMC_POWER_ON:
+		/* Cannot touch dsor yet, just power up MMC */
 		mmc_omap_power(host, 1);
+		return;
+	case MMC_POWER_ON:
 		dsor |= 1 << 11;
 		break;
 	}
@@ -986,7 +988,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	 * Writing to the CON register twice seems to do the trick. */
 	for (i = 0; i < 2; i++)
 		OMAP_MMC_WRITE(host, CON, dsor);
-	if (ios->power_mode == MMC_POWER_UP) {
+	if (ios->power_mode == MMC_POWER_ON) {
 		/* Send clock cycles, poll completion */
 		OMAP_MMC_WRITE(host, IE, 0);
 		OMAP_MMC_WRITE(host, STAT, 0xffff);