[PATCH v2] mmc: core: claim host during mmc_power_off on suspend

[PATCH v2] mmc: core: claim host during mmc_power_off on suspend

[Arik Nemtsov]

Make sure the host is claimed in all calls of mmc_power_off() during
suspend. In addition make sure mmc_power_off() isn't called twice in
some suspend flows.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Ido Yariv <ido@wizery.com>
---
v1->2: use mmc_try_claim_host(), as suggested by Adrian

 drivers/mmc/core/core.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index f545a3e..dd633d6 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2360,6 +2360,7 @@ EXPORT_SYMBOL(mmc_cache_ctrl);
 int mmc_suspend_host(struct mmc_host *host)
 {
 	int err = 0;
+	bool powered_off = false;
 
 	if (host->caps & MMC_CAP_DISABLE)
 		cancel_delayed_work(&host->disable);
@@ -2411,6 +2412,7 @@ int mmc_suspend_host(struct mmc_host *host)
 				mmc_release_host(host);
 				host->pm_flags = 0;
 				err = 0;
+				powered_off = true;
 			}
 		} else {
 			err = -EBUSY;
@@ -2418,8 +2420,14 @@ int mmc_suspend_host(struct mmc_host *host)
 	}
 	mmc_bus_put(host);
 
-	if (!err && !mmc_card_keep_power(host))
-		mmc_power_off(host);
+	if (!powered_off && !err && !mmc_card_keep_power(host)) {
+		if (mmc_try_claim_host(host)) {
+			mmc_power_off(host);
+			mmc_do_release_host(host);
+		} else {
+			err = -EBUSY;
+		}
+	}
 
 out:
 	return err;
-- 
1.7.5.4