aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2007-09-25 20:56:36 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:04 -0700
commit3e30968e55e43ef08ee08c71258711a79c550f25 (patch)
tree4e735d4b021c6e10869be053a406c4fbeaad614f /drivers/net
parent643b252123fab1a524449be3b79937f17e06a5ac (diff)
[PATCH] rt2x00: make rt2x00lib_stop_link_tuner() reentrant with link_tuner work
Calling cancel_delayed_work_sync() unconditionally won't hurt and it will avoid race conditions when another CPU is already executing link_tuner work. Signed-off-by: Modestas Vainius <modestas@vainius.eu> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f8f7e6e47f8..e8c91fb71a5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -80,8 +80,7 @@ static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev)
static void rt2x00lib_stop_link_tuner(struct rt2x00_dev *rt2x00dev)
{
- if (delayed_work_pending(&rt2x00dev->link.work))
- cancel_rearming_delayed_work(&rt2x00dev->link.work);
+ cancel_delayed_work_sync(&rt2x00dev->link.work);
}
void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev)