lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl12xx: configure suspend/resume only if associated/started

Browse Source 
Configure the device (to wowlan) only if the sta/ap
is associated/started.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller
2011-06-27 13:06:43 +03:00
committed by Luciano Coelho
parent b5d6e5f663
commit e85d1629c6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/wl12xx/main.c
View File

@@ -1610,10 +1610,13 @@ static struct notifier_block wl1271_dev_notifier = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int wl1271_configure_suspend_sta(struct wl1271 *wl) static int wl1271_configure_suspend_sta(struct wl1271 *wl)
{ {
int ret; int ret = 0;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
goto out_unlock;
ret = wl1271_ps_elp_wakeup(wl); ret = wl1271_ps_elp_wakeup(wl);
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_unlock;
@@ -1658,10 +1661,13 @@ out:
static int wl1271_configure_suspend_ap(struct wl1271 *wl) static int wl1271_configure_suspend_ap(struct wl1271 *wl)
{ {
int ret; int ret = 0;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
goto out_unlock;
ret = wl1271_ps_elp_wakeup(wl); ret = wl1271_ps_elp_wakeup(wl);
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_unlock;