From ac787f36ad94034cedd87fa86d40f3d7d6eae684 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Thu, 9 Jun 2011 23:40:27 +0000
Subject: [PATCH] --- yaml --- r: 254084 b: refs/heads/master c:
 297c7f2f158f7dfa9ab5813260ff954f9c2f83d2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ea4a5dcb198b..2cda62c4e394 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be98ca652faa6468916a9b7608befff215a8ca70
+refs/heads/master: 297c7f2f158f7dfa9ab5813260ff954f9c2f83d2
diff --git a/trunk/drivers/mmc/core/sdio_bus.c b/trunk/drivers/mmc/core/sdio_bus.c
index d29b9c36919a..d2565df8a7fb 100644
--- a/trunk/drivers/mmc/core/sdio_bus.c
+++ b/trunk/drivers/mmc/core/sdio_bus.c
@@ -189,7 +189,7 @@ static int sdio_bus_remove(struct device *dev)
 
 	/* Then undo the runtime PM settings in sdio_bus_probe() */
 	if (func->card->host->caps & MMC_CAP_POWER_OFF_CARD)
-		pm_runtime_put_noidle(dev);
+		pm_runtime_put_sync(dev);
 
 out:
 	return ret;