]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
wl12xx_sdio: set MMC_PM_KEEP_POWER flag on suspend
authorEliad Peller <eliad@wizery.com>
Fri, 13 May 2011 08:57:10 +0000 (11:57 +0300)
committerLuciano Coelho <coelho@ti.com>
Fri, 13 May 2011 11:55:48 +0000 (14:55 +0300)
if a wow trigger was configured, set the MMC_PM_KEEP_POWER flag
on suspend, so our power will be kept while the system is suspended.

We needed to set this flag on each suspend attempt (when we want
to keep power)

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/sdio.c

index 1298461c45d1d0d41b1887e2a5f7d9df71cab84a..5b03fd5ee33ff931ef80da7d3bac5d4a28d174e2 100644 (file)
@@ -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)