---

yaml --- r: 276615 b: refs/heads/master c: f6bc41f h: refs/heads/master i: 276613: 5e7f748 276611: 46ddbaf 276607: 53df5b3 v: v3
git-mirror · Dec 10, 2011 · 5dc52cb · 5dc52cb
1 parent f57def4
commit 5dc52cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;