From 9175bf1c6034ceab04023f4e48006d025ecc8daf Mon Sep 17 00:00:00 2001 From: Piotr Nakraszewicz Date: Thu, 22 Sep 2011 13:42:54 +0200 Subject: 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 Change-Id: I149f79d04718c606da97ccd9e3a0e599bba26e49 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31746 Tested-by: Piotr NAKRASZEWICZ Reviewed-by: Bartosz MARKOWSKI Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33525 Reviewed-by: Philippe LANGLAIS Tested-by: Dmitry TARNYAGIN --- drivers/staging/cw1200/sta.c | 3 +++ 1 file changed, 3 insertions(+) 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: -- cgit v1.2.3