From 5e296eb7a7036e62360e195ffa9743b3cf041d86 Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Fri, 13 May 2011 11:57:10 +0300
Subject: [PATCH] --- yaml --- r: 247653 b: refs/heads/master c:
 039bdb1494d1d514987ce596a4898494021c7af2 h: refs/heads/master i:   247651:
 06f7ad7a3f6f23174f195427694ead0c42391297 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/net/wireless/wl12xx/sdio.c | 29 +++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ccc3d068e80b..a150db5ee37a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 402e48616078c1e56f55a69d314b77f1d750d6ad
+refs/heads/master: 039bdb1494d1d514987ce596a4898494021c7af2
diff --git a/trunk/drivers/net/wireless/wl12xx/sdio.c b/trunk/drivers/net/wireless/wl12xx/sdio.c
index 1298461c45d1..5b03fd5ee33f 100644
--- a/trunk/drivers/net/wireless/wl12xx/sdio.c
+++ b/trunk/drivers/net/wireless/wl12xx/sdio.c
@@ -314,7 +314,34 @@ static int wl1271_suspend(struct device *dev)
 {
 	/* Tell MMC/SDIO core it's OK to power down the card
 	 * (if it isn't already), but not to remove it completely */
-	return 0;
+	struct sdio_func *func = dev_to_sdio_func(dev);
+	struct wl1271 *wl = sdio_get_drvdata(func);
+	mmc_pm_flag_t sdio_flags;
+	int ret = 0;
+
+	wl1271_debug(DEBUG_MAC80211, "wl1271 suspend. wow_enabled: %d",
+		     wl->wow_enabled);
+
+	/* check whether sdio should keep power */
+	if (wl->wow_enabled) {
+		sdio_flags = sdio_get_host_pm_caps(func);
+
+		if (!(sdio_flags & MMC_PM_KEEP_POWER)) {
+			wl1271_error("can't keep power while host "
+				     "is suspended");
+			ret = -EINVAL;
+			goto out;
+		}
+
+		/* keep power while host suspended */
+		ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
+		if (ret) {
+			wl1271_error("error while trying to keep power");
+			goto out;
+		}
+	}
+out:
+	return ret;
 }
 
 static int wl1271_resume(struct device *dev)