Browse Source

[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>
Ivo van Doorn 18 years ago
parent
commit
3e30968e55
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/net/wireless/rt2x00/rt2x00dev.c

+ 1 - 2
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)