openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set wlvif->ps_compl to NULL in before return 

wl1271_configure_suspend_sta leaves a stale stack declared
completion in wlvif->ps_compl. Set it to NULL before returning.

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
[small fix to use wlvif->ps_compl instead of wl->ps_compl]
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Pontus Fuchs 2011-12-14 14:32:23 +01:00 committed by Luciano Coelho
parent 7f74484a46
commit ef1870673d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1580,24 +1580,24 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
ret = wait_for_completion_timeout( ret = wait_for_completion_timeout(
&compl, msecs_to_jiffies(WL1271_PS_COMPLETE_TIMEOUT)); &compl, msecs_to_jiffies(WL1271_PS_COMPLETE_TIMEOUT));
mutex_lock(&wl->mutex);
if (ret <= 0) { if (ret <= 0) {
wl1271_warning("couldn't enter ps mode!"); wl1271_warning("couldn't enter ps mode!");
ret = -EBUSY; ret = -EBUSY;
goto out; goto out_cleanup;
} }
/* take mutex again, and wakeup */
mutex_lock(&wl->mutex);
ret = wl1271_ps_elp_wakeup(wl); ret = wl1271_ps_elp_wakeup(wl);
if (ret < 0) if (ret < 0)
goto out_unlock; goto out_cleanup;
} }
out_sleep: out_sleep:
wl1271_ps_elp_sleep(wl); wl1271_ps_elp_sleep(wl);
out_cleanup:
wlvif->ps_compl = NULL;
out_unlock: out_unlock:
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
out:
return ret; return ret;
} }