summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2012-04-26 22:07:44 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-04-27 21:25:25 +0200
commit4c1bcdb5a3354b250b82a67549f57ac27a3bb85f (patch)
treeeb0344a7ecb1ded174f3c225255e7bd8866fa8f5 /drivers/net
parentwl1251: fix crash on remove due to premature kfree (diff)
downloadlinux-4c1bcdb5a3354b250b82a67549f57ac27a3bb85f.tar.xz
linux-4c1bcdb5a3354b250b82a67549f57ac27a3bb85f.zip
wl1251: fix crash on remove due to leftover work item
This driver currently leaves elp_work behind when stopping, which occasionally results in data corruption because work function ends up accessing freed memory, typical symptoms of this are various worker_thread crashes. Fix it by cancelling elp_work. Cc: stable@vger.kernel.org # v2.6.37+ Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl1251/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c
index 41302c7b1ad0..d1afb8e3b2ef 100644
--- a/drivers/net/wireless/wl1251/main.c
+++ b/drivers/net/wireless/wl1251/main.c
@@ -479,6 +479,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
cancel_work_sync(&wl->irq_work);
cancel_work_sync(&wl->tx_work);
cancel_work_sync(&wl->filter_work);
+ cancel_delayed_work_sync(&wl->elp_work);
mutex_lock(&wl->mutex);