summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Nakraszewicz <piotr.nakraszewicz@tieto.com>2011-09-22 13:42:54 +0200
committerPhilippe LANGLAIS <philippe.langlais@stericsson.com>2011-10-13 10:17:19 +0200
commit9175bf1c6034ceab04023f4e48006d025ecc8daf (patch)
treeb03bb445ff2d04927198ad762e36fa92ca899b78
parent131faddde0f1e1d3281e5954a3e5f7aeb647547e (diff)
cw1200: cancel pending timer in cw1200_stop
Cancel pending mcast_timeout in cw1200_stop to prevent kernel crash. ST-Ericsson ID: 360744 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Piotr Nakraszewicz <piotr.nakraszewicz@tieto.com> Change-Id: I149f79d04718c606da97ccd9e3a0e599bba26e49 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31746 Tested-by: Piotr NAKRASZEWICZ <piotr.nakraszewicz@tieto.com> Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33525 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Tested-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com>
-rw-r--r--drivers/staging/cw1200/sta.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c
index 47fe596f59f..a8bebd1060e 100644
--- a/drivers/staging/cw1200/sta.c
+++ b/drivers/staging/cw1200/sta.c
@@ -127,6 +127,9 @@ void cw1200_stop(struct ieee80211_hw *dev)
cancel_delayed_work_sync(&priv->connection_loss_work);
cancel_delayed_work_sync(&priv->link_id_gc_work);
+ if (timer_pending(&priv->mcast_timeout))
+ del_timer_sync(&priv->mcast_timeout);
+
mutex_lock(&priv->conf_mutex);
switch (priv->join_status) {
case CW1200_JOIN_STATUS_STA: