From 2a4e2624cceb2f90c8c3ef6f62cc817a42d70753 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Fri, 13 May 2011 11:57:12 +0300 Subject: [PATCH] --- yaml --- r: 247655 b: refs/heads/master c: f795ea8b2f047409c59e891d6e5e86a925048bf4 h: refs/heads/master i: 247653: 5e296eb7a7036e62360e195ffa9743b3cf041d86 247651: 06f7ad7a3f6f23174f195427694ead0c42391297 247647: 56b94d5c0a1a839ad3ff1f0916ceff0275d2c66a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/sdio.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf5e710a3d2d..efc31d0c7171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f44e58681aec420b132a54823d8911293a644d4e +refs/heads/master: f795ea8b2f047409c59e891d6e5e86a925048bf4 diff --git a/trunk/drivers/net/wireless/wl12xx/sdio.c b/trunk/drivers/net/wireless/wl12xx/sdio.c index 41183db34836..92d29a860fc0 100644 --- a/trunk/drivers/net/wireless/wl12xx/sdio.c +++ b/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;