summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-06-11 10:12:35 -0700
committerVarun Wadekar <vwadekar@nvidia.com>2012-07-23 14:10:01 +0530
commit9a2a43734e110bb1f20d2c207eb98f79ea9b862b (patch)
treed1ad26c59ad885d998f61a41090500ced8f04176 /drivers/net/wireless
parentcade45e990ee601fc71d3ba5ef7e4f5f72e1d3d7 (diff)
Revert "net: wireless: bcmdhd: HACK - force active power mode"
This reverts commit 956df1fbda60f8767694699d66015587e6cee089. Conflicts: drivers/net/wireless/bcmdhd/dhd_linux.c
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/bcmdhd/dhd_linux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 11ecf607cff5..aedcd33f6bd1 100644
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -4098,7 +4098,7 @@ void dhd_detach(dhd_pub_t *dhdp)
#ifdef CONFIG_HAS_WAKELOCK
dhd->wakelock_counter = 0;
dhd->wakelock_rx_timeout_enable = 0;
- dhd->wakelock_ctrl_timeout_enable = 0;
+ dhd->wakelock_ctrl_timeout_enable = 0;
wake_lock_destroy(&dhd->wl_wifi);
wake_lock_destroy(&dhd->wl_rxwake);
wake_lock_destroy(&dhd->wl_ctrlwake);