From c95b65fd09e1108f62645cf6243a38047269860c Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Fri, 8 Oct 2010 16:16:27 +0300
Subject: [PATCH] --- yaml --- r: 215282 b: refs/heads/master c:
 674f3058c806ae2591b98f59194fa85b650aa667 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/net/wireless/wl12xx/wl1271_sdio.c | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c7fcb6673481..e220ccb2f5f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00cbb3c5317d418c349c60876fe12fba7624f3e7
+refs/heads/master: 674f3058c806ae2591b98f59194fa85b650aa667
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
index f7bef32f04c9..784ef3432641 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -290,11 +290,31 @@ static void __devexit wl1271_remove(struct sdio_func *func)
 	wl1271_free_hw(wl);
 }
 
+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;
+}
+
+static int wl1271_resume(struct device *dev)
+{
+	return 0;
+}
+
+static const struct dev_pm_ops wl1271_sdio_pm_ops = {
+	.suspend	= wl1271_suspend,
+	.resume		= wl1271_resume,
+};
+
 static struct sdio_driver wl1271_sdio_driver = {
 	.name		= "wl1271_sdio",
 	.id_table	= wl1271_devices,
 	.probe		= wl1271_probe,
 	.remove		= __devexit_p(wl1271_remove),
+	.drv = {
+		.pm = &wl1271_sdio_pm_ops,
+	},
 };
 
 static int __init wl1271_init(void)