From: Eliad Peller <eliad@wizery.com>
Date: Mon, 9 May 2011 08:32:31 +0000 (+0300)
Subject: mmc: core: clear MMC_PM_KEEP_POWER flag on resume
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8e6df7343cf67c9104955da0de70075a6ee1dfd;p=linux-beck.git

mmc: core: clear MMC_PM_KEEP_POWER flag on resume

Since the MMC_PM_KEEP_POWER flag should be set on each suspend,
it should also cleared on each resume.

Upon resuming, we have to know if power was kept
(for re-initialization, etc.), so clear it just after resuming.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
---

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 61c6c0b8f0e0..72e113e7f253 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1829,6 +1829,7 @@ int mmc_resume_host(struct mmc_host *host)
 			err = 0;
 		}
 	}
+	host->pm_flags &= ~MMC_PM_KEEP_POWER;
 	mmc_bus_put(host);
 
 	return err;