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>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index ec44671..c305841 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1580,24 +1580,24 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
 
                ret = wait_for_completion_timeout(
                        &compl, msecs_to_jiffies(WL1271_PS_COMPLETE_TIMEOUT));
+
+               mutex_lock(&wl->mutex);
                if (ret <= 0) {
                        wl1271_warning("couldn't enter ps mode!");
                        ret = -EBUSY;
-                       goto out;
+                       goto out_cleanup;
                }
 
-               /* take mutex again, and wakeup */
-               mutex_lock(&wl->mutex);
-
                ret = wl1271_ps_elp_wakeup(wl);
                if (ret < 0)
-                       goto out_unlock;
+                       goto out_cleanup;
        }
 out_sleep:
        wl1271_ps_elp_sleep(wl);
+out_cleanup:
+       wlvif->ps_compl = NULL;
 out_unlock:
        mutex_unlock(&wl->mutex);
-out:
        return ret;
 
 }