summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2009-10-12 16:08:51 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 23:48:04 +0300
commit5d0af498c08b43566733d5c5fb8293ce3b109eab (patch)
treee7591f43c47e06824de2f41230f8fd0b1fa51fa2
parentc15f63bffabb996f90b9c24c62fb0614c5a4f676 (diff)
downloadlinux-5d0af498c08b43566733d5c5fb8293ce3b109eab.tar.xz
wl1271: Enable ELP
The new firmware has fixed a firmware crash problem related to ELP entry. Enable ELP to conserve power. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_ps.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/wl1271_ps.c
index 5580e53d103a..fb821c988661 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.c
+++ b/drivers/net/wireless/wl12xx/wl1271_ps.c
@@ -39,12 +39,7 @@ void wl1271_elp_work(struct work_struct *work)
mutex_lock(&wl->mutex);
- /*
- * FIXME: below, by means of the "true", ELP has been disabled for now
- * to work around a firmware bug. To be enabled upon receiving a new
- * firmware version.
- */
- if (true || wl->elp || !wl->psm)
+ if (wl->elp || !wl->psm)
goto out;
wl1271_debug(DEBUG_PSM, "chip to elp");