From 9aca56a0f05eb57d777b1513237694c94fc41389 Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Sat, 2 Oct 2010 13:54:10 +0200
Subject: [PATCH] --- yaml --- r: 219009 b: refs/heads/master c:
 81968561bd69536c82be7ee654b04c68cd3e1746 h: refs/heads/master i:   219007:
 2d1ec67f16320171ef935c6dac2e63d1c33553fd v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/core/sdio.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d162ee31f24e..52d59c75181f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80fd933c44557c5261b80f8f8145b4fe071aeaf3
+refs/heads/master: 81968561bd69536c82be7ee654b04c68cd3e1746
diff --git a/trunk/drivers/mmc/core/sdio.c b/trunk/drivers/mmc/core/sdio.c
index f17e0e0bd9d1..0dbd6fe66660 100644
--- a/trunk/drivers/mmc/core/sdio.c
+++ b/trunk/drivers/mmc/core/sdio.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
@@ -707,6 +708,18 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
 		goto err;
 	card = host->card;
 
+	/*
+	 * Let runtime PM core know our card is active
+	 */
+	err = pm_runtime_set_active(&card->dev);
+	if (err)
+		goto remove;
+
+	/*
+	 * Enable runtime PM for this card
+	 */
+	pm_runtime_enable(&card->dev);
+
 	/*
 	 * The number of functions on the card is encoded inside
 	 * the ocr.