From 5dc52cbf8653cc54199b59bfaa70f6e67603eb32 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 16 Nov 2011 10:10:41 +0100
Subject: [PATCH] --- yaml --- r: 276615 b: refs/heads/master c:
 f6bc41fb08cbd6943df358437e0af90c91a3caa3 h: refs/heads/master i:   276613:
 5e7f7485248e66262719ef6f9b8d96aa49a6fe9c   276611:
 46ddbafe466e964c0da2a5b398692b52dea06372   276607:
 53df5b3927dcf5b0d48598703961628512e46ef5 v: v3

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

diff --git a/[refs] b/[refs]
index 5b6e12296750..16b8244ff746 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99872a16fa7642987f30c750dc166674b0d8060
+refs/heads/master: f6bc41fb08cbd6943df358437e0af90c91a3caa3
diff --git a/trunk/drivers/mmc/host/sh_mmcif.c b/trunk/drivers/mmc/host/sh_mmcif.c
index 369366c8e205..d5505f3fe2a1 100644
--- a/trunk/drivers/mmc/host/sh_mmcif.c
+++ b/trunk/drivers/mmc/host/sh_mmcif.c
@@ -908,7 +908,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		if (host->power) {
 			pm_runtime_put(&host->pd->dev);
 			host->power = false;
-			if (p->down_pwr)
+			if (p->down_pwr && ios->power_mode == MMC_POWER_OFF)
 				p->down_pwr(host->pd);
 		}
 		host->state = STATE_IDLE;