1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index d5e874825069..f27e91502631 100644
--- a/drivers/net/wireless/wl12xx/sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -28,6 +28,7 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
 #include <linux/gpio.h>
 #include <linux/wl12xx.h>
 #include <linux/pm_runtime.h>
@@ -163,11 +164,16 @@ static int wl1271_sdio_power_on(struct wl1271 *wl)
         struct sdio_func *func = wl_to_func(wl);
         int ret;
 
-        /* Power up the card */
+        /* Make sure the card will not be powered off by runtime PM */
         ret = pm_runtime_get_sync(&func->dev);
         if (ret < 0)
                 goto out;
 
+        /* Runtime PM might be disabled, so power up the card manually */
+        ret = mmc_power_restore_host(func->card->host);
+        if (ret < 0)
+                goto out;
+
         sdio_claim_host(func);
         sdio_enable_func(func);
         sdio_release_host(func);
@@ -179,12 +185,18 @@ out:
 static int wl1271_sdio_power_off(struct wl1271 *wl)
 {
         struct sdio_func *func = wl_to_func(wl);
+        int ret;
 
         sdio_claim_host(func);
         sdio_disable_func(func);
         sdio_release_host(func);
 
-        /* Power down the card */
+        /* Runtime PM might be disabled, so power off the card manually */
+        ret = mmc_power_save_host(func->card->host);
+        if (ret < 0)
+                return ret;
+
+        /* Let runtime PM know the card is powered off */
         return pm_runtime_put_sync(&func->dev);
 }