---

yaml
---
r: 247655
b: refs/heads/master
c: f795ea8
h: refs/heads/master
i:
  247653: 5e296eb
  247651: 06f7ad7
  247647: 56b94d5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f44e58681aec420b132a54823d8911293a644d4e
+refs/heads/master: f795ea8b2f047409c59e891d6e5e86a925048bf4

trunk/drivers/net/wireless/wl12xx/sdio.c

@@ -231,6 +231,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
 	const struct wl12xx_platform_data *wlan_data;
 	struct wl1271 *wl;
 	unsigned long irqflags;
+	mmc_pm_flag_t mmcflags;
 	int ret;
 
 	/* We are only able to handle the wlan function */
@@ -282,6 +283,13 @@ static int __devinit wl1271_probe(struct sdio_func *func,
 
 	disable_irq(wl->irq);
 
+	/* if sdio can keep power while host is suspended, enable wow */
+	mmcflags = sdio_get_host_pm_caps(func);
+	wl1271_debug(DEBUG_SDIO, "sdio PM caps = 0x%x", mmcflags);
+
+	if (mmcflags & MMC_PM_KEEP_POWER)
+		hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
+
 	ret = wl1271_init_ieee80211(wl);
 	if (ret)
 		goto out_irq;