diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-03-23 22:22:15 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-04-19 16:49:14 +0300 |
| commit | c1b193eb6557279d037ab18c00ab628c6c78847f (patch) | |
| tree | dad930948af8a88a23a579cb23fadca2fd2ac704 /drivers/net/wireless/wl12xx/ps.c | |
| parent | 17e672d6e4b5a8a3f330a70dfd58d25a2cb497b5 (diff) | |
| download | kernel_samsung_smdk4412-c1b193eb6557279d037ab18c00ab628c6c78847f.zip kernel_samsung_smdk4412-c1b193eb6557279d037ab18c00ab628c6c78847f.tar.gz kernel_samsung_smdk4412-c1b193eb6557279d037ab18c00ab628c6c78847f.tar.bz2 | |
wl12xx: rearrange some ELP wake_up/sleep calls
ELP (Extremely/Enhanced Low Power, or something like that ;)) refers to
the powerstate of the 12xx chip, in which very low power is consumed,
and no commands (from the host) can be issued until the chip is woken up.
Wakeup/sleep commands must be protected by a wl->mutex, so it's generally
a good idea to call wakeup/sleep along with the mutex lock/unlock (where
needed). However, in some places the wl12xx driver calls wakeup/sleep in
some "inner" functions. This result in some "nested" wakeup/sleep calls
which might end up letting the chip go to sleep prematurely (e.g. during
event handling).
Fix it by rearranging the elp calls to come along with mutex_lock/unlock.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/ps.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index 971f13e..b8deada 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c @@ -149,9 +149,6 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, case STATION_ACTIVE_MODE: default: wl1271_debug(DEBUG_PSM, "leaving psm"); - ret = wl1271_ps_elp_wakeup(wl); - if (ret < 0) - return ret; /* disable beacon early termination */ ret = wl1271_acx_bet_enable(wl, false); |