---

yaml --- r: 200524 b: refs/heads/master c: a69b03e h: refs/heads/master v: v3
git-mirror · Jun 15, 2010 · ea829fb · ea829fb
1 parent 4cc98ff
commit ea829fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7fdc95ef8e914ae8625f2ae4b3775b2bc435d3a
+refs/heads/master: a69b03e941abae00380fc6bc1877fb797a1b31e6
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -491,6 +491,7 @@ void iwl_bg_abort_scan(struct work_struct *work)
 
 	mutex_lock(&priv->mutex);
 
+	cancel_delayed_work_sync(&priv->scan_check);
 	set_bit(STATUS_SCAN_ABORTING, &priv->status);
 	iwl_send_scan_abort(priv);